From: Kim Alvefur <zash@zash.se>
Date: Wed, 13 Jul 2016 08:25:52 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=bca35c227886965fb03723280c0fc79bdadb5faa

Merge 0.10->trunk
---

bca35c227886965fb03723280c0fc79bdadb5faa