Diff

prosody.cfg.lua.dist @ 5572:19e1f9881bfc

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 10 May 2013 22:31:20 +0200
parent 5409:8e98a58ab6a3
child 5573:ca9f99f7dcbc
line wrap: on
line diff