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

Merge 0.10->trunk
---

de54243d55e396242c517ad80f2fb235d43f567e