From: Kim Alvefur <zash@zash.se>
Date: Fri, 8 Apr 2016 15:54:50 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=5707e0f89786a863f75904de86c81063e791c341;p=prosody.git

Merge 0.10->trunk
---

5707e0f89786a863f75904de86c81063e791c341