projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c9b44f 77f0e4b)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 4 Feb 2016 14:57:45 +0000 (14:57 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 4 Feb 2016 14:57:45 +0000 (14:57 +0000)

Trivial merge