From: Matthew Wild <mwild1@gmail.com>
Date: Mon, 3 Aug 2009 16:53:02 +0000 (+0100)
Subject: Merge with waqas
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=7b9f5dde4cdb0661198660080428e862df55bc01;p=prosody.git

Merge with waqas
---

7b9f5dde4cdb0661198660080428e862df55bc01