Comparison

prosody.cfg.lua.dist @ 4097:2d3866aed062

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 07 Jan 2011 11:59:05 +0000
parent 4091:c53610fdab62
child 4233:3c644c3b10e2
comparison
equal deleted inserted replaced
4092:d78d5038d144 4097:2d3866aed062