From: Kim Alvefur <zash@zash.se>
Date: Sun, 13 Dec 2015 20:22:26 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c86d0082f66bd65fb7bd4e9fc94fac401e256d0f;p=prosody.git

Merge 0.10->trunk
---

c86d0082f66bd65fb7bd4e9fc94fac401e256d0f