projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c2f0d4 f59811f)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Thu, 28 Aug 2014 11:23:58 +0000 (12:23 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 28 Aug 2014 11:23:58 +0000 (12:23 +0100)

Trivial merge