Comparison

prosody.cfg.lua.dist @ 4290:aaa06e68a9e4

Merge 0.8->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 02 Jun 2011 15:28:41 +0100
parent 4233:3c644c3b10e2
child 4497:f42a0833c47c
comparison
equal deleted inserted replaced
4286:1bceebe2b117 4290:aaa06e68a9e4