Diff

prosody.cfg.lua.dist @ 5640:4f1889672063

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