From: Kim Alvefur <zash@zash.se>
Date: Tue, 29 Mar 2016 13:38:14 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3a95d35cc1d8aa304260229bc70cca5a6458ade7;p=prosody.git

Merge 0.10->trunk
---

3a95d35cc1d8aa304260229bc70cca5a6458ade7