Diff

prosody.cfg.lua.dist @ 5629:2427c81da16c

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 May 2013 16:02:01 +0200
parent 5624:187f734bc996
child 5806:c914f4322581
line wrap: on
line diff