projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 826ddbb ee32ab4)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 17 Mar 2016 19:16:43 +0000 (19:16 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 17 Mar 2016 19:16:43 +0000 (19:16 +0000)

Trivial merge