Diff

prosody.cfg.lua.dist @ 2944:855c0eb80600

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Mar 2010 18:53:17 +0000
parent 2931:de4daf300f19
child 2984:3094166cfdd5
line wrap: on
line diff