Diff

prosody.cfg.lua.dist @ 4953:24c2150cc8b0

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 09 Jul 2012 02:36:09 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
line wrap: on
line diff