projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0d4cdc 0baa7ad)
Merge with 0.10
authorMatthew Wild <mwild1@gmail.com>
Mon, 6 Jul 2015 16:07:05 +0000 (17:07 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 6 Jul 2015 16:07:05 +0000 (17:07 +0100)

Trivial merge