From: Kim Alvefur <zash@zash.se>
Date: Sat, 19 Mar 2016 21:46:41 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8fb6335ec4d18c4185c216ea425fa3abe89301bb;p=prosody.git

Merge 0.10->trunk
---

8fb6335ec4d18c4185c216ea425fa3abe89301bb