From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 17 Mar 2016 19:16:43 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3601083d88db8e1b7eb87e5782466182fcdae90a;p=prosody.git

Merge 0.10->trunk
---

3601083d88db8e1b7eb87e5782466182fcdae90a