From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 5 Feb 2016 00:04:11 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=76e441c85feb7186cb9b1dcfb5b89fe66bb709f7;p=prosody.git

Merge 0.10->trunk
---

76e441c85feb7186cb9b1dcfb5b89fe66bb709f7