Diff

prosody.cfg.lua.dist @ 4541:05f5ec99da77

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 22 Jan 2012 22:55:49 +0000 (2012-01-22)
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
line wrap: on
line diff