Diff

prosody.cfg.lua.dist @ 4116:7ffc6828a6d6

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 11 Jan 2011 06:18:51 +0000
parent 4091:c53610fdab62
child 4233:3c644c3b10e2
line wrap: on
line diff