From: Kim Alvefur <zash@zash.se>
Date: Sun, 11 Oct 2015 18:00:15 +0000 (+0200)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b6d336cbfe79bf837dbf89f80d4852aa58a110c4;p=prosody.git

Merge 0.9->0.10
---

b6d336cbfe79bf837dbf89f80d4852aa58a110c4