Diff

prosody.cfg.lua.dist @ 4283:ffaaa3fd3189

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 00:26:48 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
line wrap: on
line diff