Comparison

prosody.cfg.lua.dist @ 548:c80137472280

Automated merge with http://waqas.ath.cx/
author Matthew Wild <mwild1@gmail.com>
date Thu, 04 Dec 2008 18:49:00 +0000
parent 525:32122251d2fe
child 911:39133bca5938
comparison
equal deleted inserted replaced
547:265c4b8f0a8a 548:c80137472280