projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fd7abf 5abe5c9)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 3 Dec 2015 15:43:02 +0000 (15:43 +0000)
committerMatthew Wild <mwild1@gmail.com>
Thu, 3 Dec 2015 15:43:02 +0000 (15:43 +0000)

Trivial merge