From: Kim Alvefur <zash@zash.se>
Date: Wed, 13 Jul 2016 16:43:28 +0000 (+0200)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=a6168c7337cc83c1c60f3e3f7b80f0bf9d7429d4

Merge 0.9->0.10
---

a6168c7337cc83c1c60f3e3f7b80f0bf9d7429d4