Diff

prosody.cfg.lua.dist @ 4289:1e68721c02f2

Merge 0.7->0.8
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 15:28:12 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
line wrap: on
line diff