From: Kim Alvefur <zash@zash.se>
Date: Thu, 25 Feb 2016 21:37:41 +0000 (+0100)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=544e05fb68f869526b71194c3bed3edd7311f3fe;p=prosody.git

Merge 0.9->0.10
---

544e05fb68f869526b71194c3bed3edd7311f3fe