projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ff524a 36ada27)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 5 Mar 2016 23:44:21 +0000 (23:44 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 5 Mar 2016 23:44:21 +0000 (23:44 +0000)

Trivial merge