From: Kim Alvefur <zash@zash.se>
Date: Tue, 19 Apr 2016 17:00:46 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=a42c0795142bf77347b6040e26a885eda1ee840c

Merge 0.10->trunk
---

a42c0795142bf77347b6040e26a885eda1ee840c