Diff

prosody.cfg.lua.dist @ 5712:177fe6978ba8

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 24 Jun 2013 18:29:04 +0100
parent 5624:187f734bc996
child 5806:c914f4322581
line wrap: on
line diff