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

Merge 0.9->trunk
---

5964c9626b5dfd8bbb7ff99f89b6bdd782c91eee