Diff

prosody.cfg.lua.dist @ 4518:f2d695d2e31e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 09 Mar 2012 18:46:19 +0000
parent 4497:f42a0833c47c
child 4775:ab73a32a655e
line wrap: on
line diff