From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Sep 2015 18:15:19 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=079005505a7684fc55c77ab2f2fc717978e96b3e;p=prosody.git

Merge 0.10->trunk
---

079005505a7684fc55c77ab2f2fc717978e96b3e