From: Kim Alvefur <zash@zash.se>
Date: Tue, 19 May 2015 14:33:47 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=971c4d14eed83f9936c4f3397c5922a7a7c23839;p=prosody.git

Merge 0.10->trunk
---

971c4d14eed83f9936c4f3397c5922a7a7c23839