From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 10 Oct 2013 21:26:41 +0000 (+0100)
Subject: Merge 0.9->0.10
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=07c90d3e366f5e455724be1d744f788b5cb93771;p=prosody.git

Merge 0.9->0.10
---

07c90d3e366f5e455724be1d744f788b5cb93771