Comparison

prosody.cfg.lua.dist @ 3196:d35b181a895a

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 07 Jun 2010 12:19:14 +0100
parent 3165:4ffb5469c1f6
child 3273:e9f5489ed2fe
comparison
equal deleted inserted replaced
3184:1b076d237a20 3196:d35b181a895a