Comparison

prosody.cfg.lua.dist @ 1339:7d77f92f94c9

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Fri, 12 Jun 2009 11:37:34 +0100
parent 1291:22dcd5f06bc4
child 1446:109ca9e7a6f3
comparison
equal deleted inserted replaced
1338:0bfc8d866479 1339:7d77f92f94c9