projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb079a5 b5f68db)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 3 Sep 2013 11:32:18 +0000 (12:32 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 3 Sep 2013 11:32:18 +0000 (12:32 +0100)

Trivial merge