Diff

prosody.cfg.lua.dist @ 5920:0e5a38ba4c15

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Nov 2013 11:59:43 +0100
parent 5806:c914f4322581
child 6037:7bbe22d8dd09
line wrap: on
line diff