From: Kim Alvefur <zash@zash.se>
Date: Wed, 25 May 2016 19:35:09 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=8df2517bf2e7930e32ebf79a11b29206cb30782c

Merge 0.10->trunk
---

8df2517bf2e7930e32ebf79a11b29206cb30782c