Diff

prosody.cfg.lua.dist @ 5501:12a42421bede

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