From: Kim Alvefur <zash@zash.se>
Date: Mon, 21 Mar 2016 13:52:43 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=9c85fcb7b572a271520fcca37e381445326d1251;p=prosody.git

Merge 0.10->trunk
---

9c85fcb7b572a271520fcca37e381445326d1251