From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 5 Jun 2011 00:54:06 +0000 (+0100)
Subject: Merge 0.8->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=0d3a399b188ac9981f47256bc500007fdcb2bf27;p=prosody.git

Merge 0.8->trunk
---

0d3a399b188ac9981f47256bc500007fdcb2bf27