projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ef2d6d 6ff7d4c)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Nov 2015 10:45:15 +0000 (10:45 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 24 Nov 2015 10:45:15 +0000 (10:45 +0000)

Trivial merge