From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 22 Jul 2009 20:35:58 +0000 (+0100)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=7baa83edbd77d8d0a48b244160ef33d435b7f911;p=prosody.git

Merge with 0.5
---

7baa83edbd77d8d0a48b244160ef33d435b7f911