From: Kim Alvefur <zash@zash.se>
Date: Wed, 26 Feb 2014 21:22:43 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f6894d7e9d7f13b206f9c3d6fb1bb232a1b625d5;p=prosody.git

Merge 0.10->trunk
---

f6894d7e9d7f13b206f9c3d6fb1bb232a1b625d5