projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6924d7b ae7e41c)
Merge
authorMatthew Wild <mwild1@gmail.com>
Tue, 1 Apr 2014 14:02:36 +0000 (15:02 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 1 Apr 2014 14:02:36 +0000 (15:02 +0100)

Trivial merge