projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79348d8 41ecd82)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 12 May 2016 17:45:59 +0000 (18:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 12 May 2016 17:45:59 +0000 (18:45 +0100)

Trivial merge