Diff

prosody.cfg.lua.dist @ 5855:275d4da9404f

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 05 Oct 2013 12:16:28 -0400
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff