projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b8fb16 76189b1)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 3 Dec 2015 16:13:33 +0000 (16:13 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 3 Dec 2015 16:13:33 +0000 (16:13 +0000)

Trivial merge