Diff

prosody.cfg.lua.dist @ 2954:24483a7bf420

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 30 Mar 2010 19:48:04 +0100
parent 2931:de4daf300f19
child 2984:3094166cfdd5
line wrap: on
line diff