From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 13 Oct 2009 10:13:52 +0000 (+0100)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=154cae8558010dbb85963b04f1dc1cc901bc6d8c;p=prosody.git

Merge with 0.5
---

154cae8558010dbb85963b04f1dc1cc901bc6d8c