Diff

prosody.cfg.lua.dist @ 2933:e68ff49fa79b

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Wed, 24 Mar 2010 22:34:59 +0000
parent 2931:de4daf300f19
child 2984:3094166cfdd5
line wrap: on
line diff