From: Kim Alvefur <zash@zash.se>
Date: Fri, 15 Apr 2016 11:39:56 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=27ea87ad73b8080008253b93d8cf8919632a466f;p=prosody.git

Merge 0.10->trunk
---

27ea87ad73b8080008253b93d8cf8919632a466f