Diff

prosody.cfg.lua.dist @ 3378:bb49ada7cf45

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