From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 23 Jul 2009 00:38:52 +0000 (+0100)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c7b3e5c7ecea2f0733e8da7ff8a20a8e1622e350;p=prosody.git

Merge with 0.5
---

c7b3e5c7ecea2f0733e8da7ff8a20a8e1622e350