projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33bfe9c c84c48c)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2016 13:49:19 +0000 (13:49 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 18 Feb 2016 13:49:19 +0000 (13:49 +0000)

Trivial merge