Diff

prosody.cfg.lua.dist @ 3121:27f895bac9c0

Merge trunk/Tobias->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 24 May 2010 19:39:07 +0100
parent 2984:3094166cfdd5
child 3165:4ffb5469c1f6
line wrap: on
line diff