From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 8 Jul 2013 23:04:30 +0000 (+0100)
Subject: Merge 0.9->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=819143bb5cd3cae600e0c0bb467c5b2c515a7e01;p=prosody.git

Merge 0.9->trunk
---

819143bb5cd3cae600e0c0bb467c5b2c515a7e01