projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffa0e8a 9f78eb4)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 8 Apr 2013 14:32:51 +0000 (15:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 8 Apr 2013 14:32:51 +0000 (15:32 +0100)

Trivial merge