Diff

prosody.cfg.lua.dist @ 5437:1994a4483b1c

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 06 Apr 2013 12:21:01 +0100
parent 5409:8e98a58ab6a3
child 5573:ca9f99f7dcbc
line wrap: on
line diff