Diff

prosody.cfg.lua.dist @ 4295:da4844ab289f

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 03 Jun 2011 00:58:09 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
line wrap: on
line diff