projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f862e1c d5f0bf3)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 15 Apr 2014 17:08:16 +0000 (18:08 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 15 Apr 2014 17:08:16 +0000 (18:08 +0100)

Trivial merge