From: Waqas Hussain <waqas20@gmail.com>
Date: Tue, 13 Oct 2009 10:00:59 +0000 (+0500)
Subject: Merge with 0.5
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=863f00a39e9e9a50569b3390c5bc16f27c4e88ea;p=prosody.git

Merge with 0.5
---

863f00a39e9e9a50569b3390c5bc16f27c4e88ea