Diff

prosody.cfg.lua.dist @ 5926:4fd1e660744d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 24 Nov 2013 14:24:53 +0100
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff