From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 14 May 2013 08:39:32 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=a16fb077c62b35c16d4e9b2412e4bc2c29ae3c49;p=prosody.git

Merge 0.9->trunk
---

a16fb077c62b35c16d4e9b2412e4bc2c29ae3c49