From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 28 Jun 2016 13:54:43 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=81f0109d9ca8b731b263ad2a13b3ec5a3c7ecffc;hp=-c;p=prosody.git

Merge 0.10->trunk
---

81f0109d9ca8b731b263ad2a13b3ec5a3c7ecffc