projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c86d008 4a1c84c)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 16 Dec 2015 16:47:34 +0000 (16:47 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 16 Dec 2015 16:47:34 +0000 (16:47 +0000)

Trivial merge