projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c85fcb 1cdea38)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 21 Mar 2016 21:05:15 +0000 (21:05 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 21 Mar 2016 21:05:15 +0000 (21:05 +0000)

Trivial merge