Comparison

prosody.cfg.lua.dist @ 1759:4a280effc975

Automated merge with http://prosody.im/source/hg
author Tobias Markmann <tm@ayena.de>
date Sun, 06 Sep 2009 22:08:05 +0200
parent 1548:b88b30c9e688
child 1810:7c45ae42923a
comparison
equal deleted inserted replaced
1733:d55ee6c66910 1759:4a280effc975