From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 16 Dec 2008 02:40:50 +0000 (+0000)
Subject: Second merge from waqas
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=88e5c422ce6f04b5961af13f1804f4d31d5464f2;p=prosody.git

Second merge from waqas
---

88e5c422ce6f04b5961af13f1804f4d31d5464f2