Diff

prosody.cfg.lua.dist @ 3055:6405d899764e

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 20 May 2010 09:41:27 +0100
parent 2984:3094166cfdd5
child 3165:4ffb5469c1f6
line wrap: on
line diff