Diff

prosody.cfg.lua.dist @ 5622:8bd1548a48b1

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 22 May 2013 14:33:18 +0100
parent 5615:b678868cf2d8
child 5623:5752391fa27d
line wrap: on
line diff