projects / prosody.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1339207 ad25381)
Merge 0.10->trunk
authordaurnimator <quae@daurnimator.com>
Mon, 29 Sep 2014 17:59:16 +0000 (13:59 -0400)
committerdaurnimator <quae@daurnimator.com>
Mon, 29 Sep 2014 17:59:16 +0000 (13:59 -0400)

Trivial merge