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

Merge 0.10->trunk
---

20260cb12d60f94955acecb6779e523611e22268