projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85c6fd1 cc431c1)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 11 Apr 2013 23:32:10 +0000 (00:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 11 Apr 2013 23:32:10 +0000 (00:32 +0100)

Trivial merge