Diff

prosody.cfg.lua.dist @ 5599:34e9f237b915

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 18 May 2013 13:20:46 +0200
parent 5573:ca9f99f7dcbc
child 5615:b678868cf2d8
line wrap: on
line diff