From: Kim Alvefur <zash@zash.se>
Date: Fri, 18 Mar 2016 10:55:40 +0000 (+0100)
Subject: Merge
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3f3b4ad384772a0e8befe22d489804a4cb7c9f91;p=prosody.git

Merge
---

3f3b4ad384772a0e8befe22d489804a4cb7c9f91