From: Kim Alvefur <zash@zash.se>
Date: Mon, 30 May 2016 11:17:28 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=c18153e25135af31149458afbb695fa8e84f345f

Merge 0.10->trunk
---

c18153e25135af31149458afbb695fa8e84f345f