Comparison

prosody.cfg.lua.dist @ 6368:bd0c8b361589

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 28 Aug 2014 12:05:18 +0100
parent 6345:8e006348d0e5
child 7359:a5a080c12c96
child 8258:503f424d4f07
comparison
equal deleted inserted replaced
6354:bbb4a82db32e 6368:bd0c8b361589