projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ff5300 b76e1bd)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 8 Jul 2013 20:41:31 +0000 (21:41 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 8 Jul 2013 20:41:31 +0000 (21:41 +0100)

Trivial merge