Diff

prosody.cfg.lua.dist @ 4927:13d18cc6527d

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 12 Jun 2012 13:55:56 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
line wrap: on
line diff