Comparison

prosody.cfg.lua.dist @ 3202:1a8a5b89a5ad

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 09 Jun 2010 01:11:12 +0100
parent 3165:4ffb5469c1f6
child 3273:e9f5489ed2fe
comparison
equal deleted inserted replaced
3197:f1db45e89317 3202:1a8a5b89a5ad