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

Merge 0.10->trunk
---

e675979fa9fbb46c957ffe195f0b757ce0d2c4c4