From: Kim Alvefur <zash@zash.se>
Date: Wed, 4 May 2016 14:58:25 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=6bf03026751e4d7223c8c2e8f294f0bac66c04ad

Merge 0.10->trunk
---

6bf03026751e4d7223c8c2e8f294f0bac66c04ad