From: Kim Alvefur <zash@zash.se>
Date: Thu, 17 Mar 2016 23:08:58 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=6a13823cd1a8cb64fd8c08c98af1f4cc4752ab9b;p=prosody.git

Merge 0.10->trunk
---

6a13823cd1a8cb64fd8c08c98af1f4cc4752ab9b