projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b10f3c 9e5a592)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 4 May 2011 22:13:50 +0000 (23:13 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 4 May 2011 22:13:50 +0000 (23:13 +0100)

Trivial merge