Diff

prosody.cfg.lua.dist @ 2916:c29ecf0cadff

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Mar 2010 14:59:03 +0000
parent 2716:4e4a24a1288d
child 2930:832ab8cf7c57
line wrap: on
line diff