Comparison

prosody.cfg.lua.dist @ 4940:39781d4d3173

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 05 Jul 2012 17:40:12 +0100
parent 4775:ab73a32a655e
child 5293:fe9215155453
comparison
equal deleted inserted replaced
4932:212e81ac6ebb 4940:39781d4d3173