Comparison

prosody.cfg.lua.dist @ 535:74f32ac6db40

Automated merge with http://84.46.7.57:1234
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Dec 2008 19:34:41 +0000
parent 525:32122251d2fe
child 911:39133bca5938
comparison
equal deleted inserted replaced
534:684cd8aedc1a 535:74f32ac6db40