From: Kim Alvefur <zash@zash.se>
Date: Thu, 28 Nov 2013 15:17:21 +0000 (+0100)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=481ee86104d0dc5cc2965bd1c44a7080a3e4dc64;p=prosody.git

Merge 0.9->0.10
---

481ee86104d0dc5cc2965bd1c44a7080a3e4dc64