projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5446677 289498a)
Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 14 Oct 2014 09:59:54 +0000 (10:59 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 14 Oct 2014 09:59:54 +0000 (10:59 +0100)

Trivial merge