Diff

prosody.cfg.lua.dist @ 2973:61e103d99578

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 11 Apr 2010 01:30:31 +0100
parent 2931:de4daf300f19
child 2984:3094166cfdd5
line wrap: on
line diff