Diff

prosody.cfg.lua.dist @ 2692:b669a0ae99e2

Merge trunk with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 21 Feb 2010 16:44:37 +0000
parent 2408:550dd0014575
child 2694:a6d80b6e9ee1
line wrap: on
line diff