From: Kim Alvefur <zash@zash.se>
Date: Wed, 24 Feb 2016 10:20:00 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=a05c09b7bbf6c4dc3e967136f926e7da1248e666;p=prosody.git

Merge 0.10->trunk
---

a05c09b7bbf6c4dc3e967136f926e7da1248e666