Comparison

prosody.cfg.lua.dist @ 1336:389b4fb48901

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Fri, 12 Jun 2009 11:21:25 +0100
parent 1291:22dcd5f06bc4
child 1446:109ca9e7a6f3
comparison
equal deleted inserted replaced
1335:7c71783b40cf 1336:389b4fb48901