projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 455af00 8806da0)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 28 Jun 2016 13:54:43 +0000 (14:54 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 28 Jun 2016 13:54:43 +0000 (14:54 +0100)

Trivial merge