projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa0b9dd df3d5f1)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 11 Jul 2013 14:10:04 +0000 (15:10 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 11 Jul 2013 14:10:04 +0000 (15:10 +0100)

Trivial merge