projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 203a198 1d89ef7)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Wed, 26 Jun 2013 20:40:33 +0000 (21:40 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 26 Jun 2013 20:40:33 +0000 (21:40 +0100)

Trivial merge