From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 19 May 2015 08:31:12 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c9492b4832d02487e200126d7caea403bc5e06fd;p=prosody.git

Merge 0.10->trunk
---

c9492b4832d02487e200126d7caea403bc5e06fd