Diff

prosody.cfg.lua.dist @ 5955:b3d5aa57c454

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 18 Dec 2013 18:37:38 +0100
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff