Diff

prosody.cfg.lua.dist @ 4593:470f502f02a3

Merge with Maranda
author Matthew Wild <mwild1@gmail.com>
date Thu, 08 Mar 2012 00:18:16 +0000
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
line wrap: on
line diff