From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 27 Jul 2009 21:42:36 +0000 (+0100)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=539017cb736e4b52f5b882e37f2bdf95af9e59e7;p=prosody.git

Merge with 0.5
---

539017cb736e4b52f5b882e37f2bdf95af9e59e7