projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f9073e b22a1e6)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:40:12 +0000 (17:40 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 5 Jul 2012 16:40:12 +0000 (17:40 +0100)

Trivial merge