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

Merge 0.10->trunk
---

df4d9d12f4ed5f9bb1341928005ad2f57cb0deb4