Diff

prosody.cfg.lua.dist @ 2948:1ac5ef6ce1a0

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