Comparison

prosody.cfg.lua.dist @ 1261:497178e0ddbe

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Jun 2009 01:36:42 +0100
parent 1176:2be14b7021b2
child 1291:22dcd5f06bc4
comparison
equal deleted inserted replaced
1260:04c1fae0eb03 1261:497178e0ddbe