From: Kim Alvefur <zash@zash.se>
Date: Fri, 24 Jun 2016 13:11:06 +0000 (+0200)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=edc4a8042744ed9d49c079f11a10acfce126a6df

Merge 0.9->0.10
---

edc4a8042744ed9d49c079f11a10acfce126a6df