From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 22 Jan 2016 13:22:50 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=22e013f82e8ab80c2bec0a6e37d1603cfeec7d40;p=prosody.git

Merge 0.10->trunk
---

22e013f82e8ab80c2bec0a6e37d1603cfeec7d40