Diff

prosody.cfg.lua.dist @ 5246:eba55873ef29

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 15 Dec 2012 05:35:43 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
line wrap: on
line diff