projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bf9430 d4bb7ec)
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Wed, 3 Sep 2014 17:50:20 +0000 (18:50 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 3 Sep 2014 17:50:20 +0000 (18:50 +0100)

Trivial merge