Comparison

prosody.cfg.lua.dist @ 4243:8973653feb35

Merge 0.8 -> trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 05 Apr 2011 14:38:08 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
comparison
equal deleted inserted replaced
4238:05f991b4a90e 4243:8973653feb35