From: Kim Alvefur <zash@zash.se>
Date: Sun, 21 Feb 2016 15:54:56 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=a98b54295f323341d35a61e35a3d381f36ecb0ec;p=prosody.git

Merge 0.10->trunk
---

a98b54295f323341d35a61e35a3d381f36ecb0ec