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

Merge 0.9->trunk
---

cfd535b7f2674fb24eb4e82bf0ea3a8e76794fb3