projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac789a4 43dca33)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 22 May 2016 19:07:20 +0000 (20:07 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 22 May 2016 19:07:20 +0000 (20:07 +0100)

Trivial merge