projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ccf5f5 74d2cce)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 13 Sep 2012 17:32:24 +0000 (18:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 13 Sep 2012 17:32:24 +0000 (18:32 +0100)

Trivial merge