projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e307245 d3ea20e)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 28 Apr 2013 23:36:04 +0000 (00:36 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sun, 28 Apr 2013 23:36:04 +0000 (00:36 +0100)

Trivial merge