projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f2ead9 b9490d3)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:49:44 +0000 (18:49 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 8 Jul 2012 17:49:44 +0000 (18:49 +0100)

Trivial merge