From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 30 Nov 2008 01:02:12 +0000 (+0000)
Subject: Merge from waqas
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=33c9234d80050ab89343ae1e327bf2bc55004cd7;p=prosody.git

Merge from waqas
---

33c9234d80050ab89343ae1e327bf2bc55004cd7