Diff

prosody.cfg.lua.dist @ 2961:db3c0ecce3f4

Merge 0.6->0.7
author Matthew Wild <mwild1@gmail.com>
date Sat, 03 Apr 2010 23:09:11 +0100
parent 2931:de4daf300f19
child 2984:3094166cfdd5
line wrap: on
line diff