From: Kim Alvefur <zash@zash.se>
Date: Thu, 25 Jun 2015 16:54:01 +0000 (+0200)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f6b3f550857678d676b31c5338f4bc6a93df1339;p=prosody.git

Merge 0.9->0.10
---

f6b3f550857678d676b31c5338f4bc6a93df1339