projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86ceb9a 7c60c69)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 15 Apr 2013 20:26:20 +0000 (21:26 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 15 Apr 2013 20:26:20 +0000 (21:26 +0100)

Trivial merge