From: Kim Alvefur <zash@zash.se>
Date: Tue, 5 Apr 2016 18:54:43 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=bc7858df342295ecba0b5d9ec2b6ea98a9c589f3;p=prosody.git

Merge 0.10->trunk
---

bc7858df342295ecba0b5d9ec2b6ea98a9c589f3