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

Merge 0.10->trunk
---

0736485d68cfa0669aa2fb7d5596a498604c2cd1