projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4d2cdb ba2c79e)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 17 Apr 2013 23:10:52 +0000 (00:10 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 17 Apr 2013 23:10:52 +0000 (00:10 +0100)

Trivial merge