Diff

prosody.cfg.lua.dist @ 3301:772fb30b28fb

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