Comparison

prosody.cfg.lua.dist @ 4255:0c525524f2dc

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 15 Apr 2011 22:46:57 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
comparison
equal deleted inserted replaced
4252:210639fb8fbe 4255:0c525524f2dc