Diff

prosody.cfg.lua.dist @ 3312:12fc7e005e8b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Jul 2010 17:44:14 +0100
parent 3273:e9f5489ed2fe
child 3412:7c66519f4973
line wrap: on
line diff