From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 5 Jul 2012 16:41:57 +0000 (+0100)
Subject: Merge (some of) trunk -> 0.9
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=bf94620a78ead8f05c45ffe068888944e5f47568;p=prosody.git

Merge (some of) trunk -> 0.9
---

bf94620a78ead8f05c45ffe068888944e5f47568