From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 17 Apr 2013 23:41:25 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=28b3f8e844dcb9b47fdbd6240c8c4851de9ed48a;p=prosody.git

Merge 0.9->trunk
---

28b3f8e844dcb9b47fdbd6240c8c4851de9ed48a