projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb3d585 8d72d22)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 4 Sep 2015 10:11:40 +0000 (11:11 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 4 Sep 2015 10:11:40 +0000 (11:11 +0100)

Trivial merge