projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e54f2a cca1450)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 15 Apr 2013 15:43:08 +0000 (16:43 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 15 Apr 2013 15:43:08 +0000 (16:43 +0100)

Trivial merge