Diff

prosody.cfg.lua.dist @ 3305:b1ee8d390744

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 29 Jun 2010 20:23:31 +0100 (2010-06-29)
parent 3273:e9f5489ed2fe
child 3412:7c66519f4973
line wrap: on
line diff