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

Trivial merge