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

Merge 0.10->trunk
---

e18dff035f84e31fb8f4ebf685523db6f31c11b5