Diff

prosody.cfg.lua.dist @ 4281:5a0144a032d8

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 00:25:44 +0100
parent 2984:3094166cfdd5
child 3165:4ffb5469c1f6
line wrap: on
line diff