From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 24 Dec 2008 23:19:48 +0000 (+0000)
Subject: Automated merge with http://waqas.ath.cx:8000/
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=67081a9864d45796f59658ccd4b779ffbe0d44e0;p=prosody.git

Automated merge with http://waqas.ath.cx:8000/
---

67081a9864d45796f59658ccd4b779ffbe0d44e0