Diff

prosody.cfg.lua.dist @ 4208:25ce18c93417

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 25 Feb 2011 00:08:14 +0000
parent 4091:c53610fdab62
child 4233:3c644c3b10e2
line wrap: on
line diff