projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 144a8fc f240ada)
Merge the merge
authorMatthew Wild <mwild1@gmail.com>
Thu, 13 Jun 2013 22:24:36 +0000 (23:24 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 13 Jun 2013 22:24:36 +0000 (23:24 +0100)

Trivial merge