From: Kim Alvefur <zash@zash.se>
Date: Sun, 6 Mar 2016 17:52:22 +0000 (+0100)
Subject: Merge trunk->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=ceee3af9aa99770ca253cb886795f43d3951bbed;p=prosody.git

Merge trunk->0.10
---

ceee3af9aa99770ca253cb886795f43d3951bbed