From: Kim Alvefur <zash@zash.se>
Date: Tue, 25 Mar 2014 18:18:32 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=e9246e4cbc3e7a9de6d79ea8f5a591801e51393e;p=prosody.git

Merge 0.10->trunk
---

e9246e4cbc3e7a9de6d79ea8f5a591801e51393e