projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4462ebf 5d19dea)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 26 Apr 2013 11:25:53 +0000 (12:25 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 26 Apr 2013 11:25:53 +0000 (12:25 +0100)

Trivial merge