projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6361d13 b40b00c)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 27 Jan 2016 20:38:09 +0000 (20:38 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 27 Jan 2016 20:38:09 +0000 (20:38 +0000)

Trivial merge