projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3eb2b3b 67b9e1c)
Merge 0.8->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 01:31:18 +0000 (02:31 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 2 Jun 2011 01:31:18 +0000 (02:31 +0100)

Trivial merge