From: Kim Alvefur <zash@zash.se>
Date: Sat, 26 Mar 2016 13:54:39 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=41e88b680832d0331d3759bc72a777fb6355d781;p=prosody.git

Merge 0.10->trunk
---

41e88b680832d0331d3759bc72a777fb6355d781