From: Kim Alvefur <zash@zash.se>
Date: Sun, 22 May 2016 12:39:20 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=670c0bb01015bf63176eafc5c605c800c7053e1f

Merge 0.10->trunk
---

670c0bb01015bf63176eafc5c605c800c7053e1f