From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 16 Dec 2015 16:47:34 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=add8d81b2a58169821e0f668a45da6f743433d70;p=prosody.git

Merge 0.10->trunk
---

add8d81b2a58169821e0f668a45da6f743433d70