projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 032dbb3 b8737d7)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Thu, 10 Oct 2013 21:26:41 +0000 (22:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 10 Oct 2013 21:26:41 +0000 (22:26 +0100)

Trivial merge