Diff

prosody.cfg.lua.dist @ 5911:7051dc27e531

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 10 Nov 2013 23:10:46 +0000
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff