From: Kim Alvefur <zash@zash.se>
Date: Sun, 17 Apr 2016 20:28:48 +0000 (+0200)
Subject: Merge with Link Mauve
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=7bdfc9df4f0a52f314e7ce285a7103321c7da711;p=prosody.git

Merge with Link Mauve
---

7bdfc9df4f0a52f314e7ce285a7103321c7da711