From: Matthew Wild Date: Sat, 29 Nov 2008 01:01:19 +0000 (+0000) Subject: Automated merge with http://waqas.ath.cx/ X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=3395d8d77e2d0a20361541f1d9fd6a4060ed3c4b;p=prosody.git Automated merge with http://waqas.ath.cx/ --- 3395d8d77e2d0a20361541f1d9fd6a4060ed3c4b