From: Kim Alvefur <zash@zash.se>
Date: Thu, 24 Mar 2016 12:57:58 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=237fa41417a18f17c288b2a45efe60579717550e;p=prosody.git

Merge 0.10->trunk
---

237fa41417a18f17c288b2a45efe60579717550e