From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 28 Mar 2013 12:17:15 +0000 (+0000)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=8bd6d440da56ef6d6785d6e8419bb9cc3171de6f;p=prosody.git

Merge 0.9->trunk
---

8bd6d440da56ef6d6785d6e8419bb9cc3171de6f