Diff

prosody.cfg.lua.dist @ 4206:c88f646a34d3

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 24 Feb 2011 18:20:05 +0000
parent 4091:c53610fdab62
child 4233:3c644c3b10e2
line wrap: on
line diff