projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9af93b d6a2547)
Merge
authorMatthew Wild <mwild1@gmail.com>
Wed, 16 Dec 2015 16:44:40 +0000 (16:44 +0000)
committerMatthew Wild <mwild1@gmail.com>
Wed, 16 Dec 2015 16:44:40 +0000 (16:44 +0000)

Trivial merge