projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10b02ae 184be52)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 13 May 2015 16:00:27 +0000 (17:00 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 13 May 2015 16:00:27 +0000 (17:00 +0100)

Trivial merge