projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6242ac 437e7f4)
Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 16 Sep 2013 17:41:30 +0000 (18:41 +0100)
committerMatthew Wild <mwild1@gmail.com>
Mon, 16 Sep 2013 17:41:30 +0000 (18:41 +0100)

Trivial merge