From: Waqas Hussain <waqas20@gmail.com>
Date: Thu, 11 Feb 2010 21:50:57 +0000 (+0500)
Subject: Merge with trunk.
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=b6dfdd3762b43b153aeb2b9274ee88d30b4fb7e6;p=prosody.git

Merge with trunk.
---

b6dfdd3762b43b153aeb2b9274ee88d30b4fb7e6