Diff

prosody.cfg.lua.dist @ 3012:6d86e26f0923

Merge configmanager->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 05 May 2010 19:01:14 +0100
parent 2984:3094166cfdd5
child 3165:4ffb5469c1f6
line wrap: on
line diff