From: Waqas Hussain <waqas20@gmail.com>
Date: Thu, 4 Jun 2009 15:48:23 +0000 (+0500)
Subject: Merge with trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=72671bbe38f242d54966de5dc573dff02119553f;p=prosody.git

Merge with trunk
---

72671bbe38f242d54966de5dc573dff02119553f