projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97043cc cb40ff9)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 3 Sep 2015 15:43:46 +0000 (16:43 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 3 Sep 2015 15:43:46 +0000 (16:43 +0100)

Trivial merge