From: Kim Alvefur <zash@zash.se>
Date: Mon, 30 May 2016 11:30:53 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=2b1dc0cc310168a2272e6e57268e1cae6f01af3c

Merge 0.10->trunk
---

2b1dc0cc310168a2272e6e57268e1cae6f01af3c