From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 7 Jul 2016 22:12:25 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=a1c272e4c48e807e798444a369700cfd1f0ab755

Merge 0.10->trunk
---

a1c272e4c48e807e798444a369700cfd1f0ab755