projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3230cf ec0fecd)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 22 Jul 2012 16:08:09 +0000 (17:08 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 22 Jul 2012 16:08:09 +0000 (17:08 +0100)

Trivial merge