Diff

prosody.cfg.lua.dist @ 5457:953888c31071

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 09 Apr 2013 15:51:08 +0200
parent 5409:8e98a58ab6a3
child 5573:ca9f99f7dcbc
line wrap: on
line diff