Diff

prosody.cfg.lua.dist @ 3318:8d09b21aeaa9

Merge 0.7->trunk
author Waqas Hussain <waqas20@gmail.com>
date Sat, 03 Jul 2010 18:13:54 +0500
parent 3273:e9f5489ed2fe
child 3412:7c66519f4973
line wrap: on
line diff