From: Kim Alvefur <zash@zash.se>
Date: Sat, 26 Sep 2015 22:36:34 +0000 (+0200)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=a14deb1f4521c0dd3a1e062c521ba71c54bafc75;p=prosody.git

Merge 0.9->0.10
---

a14deb1f4521c0dd3a1e062c521ba71c54bafc75