From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 18 Feb 2016 13:24:21 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=33bfe9cc10bfbf79aeffcca5bfe1014adab43282;p=prosody.git

Merge 0.10->trunk
---

33bfe9cc10bfbf79aeffcca5bfe1014adab43282