projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41e88b6 599d774)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sat, 26 Mar 2016 20:17:59 +0000 (20:17 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 26 Mar 2016 20:17:59 +0000 (20:17 +0000)

Trivial merge