From: Kim Alvefur <zash@zash.se>
Date: Wed, 10 Feb 2016 06:57:58 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f760c52919054661d998f7e0b628a317dedfa4cd;p=prosody.git

Merge 0.10->trunk
---

f760c52919054661d998f7e0b628a317dedfa4cd