Comparison

prosody.cfg.lua.dist @ 4248:d79d1255fd40

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 11 Apr 2011 17:01:55 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
comparison
equal deleted inserted replaced
4246:d0767040236f 4248:d79d1255fd40