Diff

prosody.cfg.lua.dist @ 2744:887d3a0e1e4e

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Mar 2010 18:35:23 +0000
parent 2716:4e4a24a1288d
child 2930:832ab8cf7c57
line wrap: on
line diff