projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3f6d1b f12ba07)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 19 Feb 2016 12:18:53 +0000 (12:18 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 19 Feb 2016 12:18:53 +0000 (12:18 +0000)

Trivial merge