projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52de3be c74048d)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 3 Apr 2015 18:34:47 +0000 (19:34 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 3 Apr 2015 18:34:47 +0000 (19:34 +0100)

Trivial merge