projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5379082 d7500b7)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 26 Mar 2015 16:49:03 +0000 (16:49 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 26 Mar 2015 16:49:03 +0000 (16:49 +0000)

Trivial merge