From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 19 Feb 2016 12:18:53 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=be38f07c4412834754783950074e72841ebc9eb4;p=prosody.git

Merge 0.10->trunk
---

be38f07c4412834754783950074e72841ebc9eb4