Diff

prosody.cfg.lua.dist @ 6055:596539a30e9b

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 02 Apr 2014 17:42:22 +0100
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
line wrap: on
line diff