Diff

prosody.cfg.lua.dist @ 2691:6863b629aa6a

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