From: Kim Alvefur <zash@zash.se>
Date: Sun, 10 Jan 2016 02:57:17 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=5082d3041ff66a8b54e799af2194b9b64b7c29bb;p=prosody.git

Merge 0.10->trunk
---

5082d3041ff66a8b54e799af2194b9b64b7c29bb