projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 190c1c5 01d35c1)
Merge
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Nov 2015 10:45:48 +0000 (10:45 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 24 Nov 2015 10:45:48 +0000 (10:45 +0000)

Trivial merge