projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81f0109 fd1def0)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 7 Jul 2016 22:12:25 +0000 (23:12 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 7 Jul 2016 22:12:25 +0000 (23:12 +0100)

Trivial merge