projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea83efa 33b9ee1)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Wed, 27 Jan 2016 20:32:01 +0000 (20:32 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 27 Jan 2016 20:32:01 +0000 (20:32 +0000)

Trivial merge