Comparison

prosody.cfg.lua.dist @ 6316:e144a1b67c30

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 25 Jul 2014 13:54:47 +0100
parent 6037:7bbe22d8dd09
child 6345:8e006348d0e5
comparison
equal deleted inserted replaced
6313:8bd486b6e5ec 6316:e144a1b67c30