Diff

prosody.cfg.lua.dist @ 4948:2c1de519f639

Merge with backout
author Matthew Wild <mwild1@gmail.com>
date Sun, 08 Jul 2012 18:48:28 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
line wrap: on
line diff