Diff

prosody.cfg.lua.dist @ 5677:9afc94c4346e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 13 Jun 2013 00:09:56 +0100
parent 5624:187f734bc996
child 5806:c914f4322581
line wrap: on
line diff