Comparison

prosody.cfg.lua.dist @ 5651:c968c8e3596d

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 07 Jun 2013 13:23:04 +0100
parent 5624:187f734bc996
child 5806:c914f4322581
comparison
equal deleted inserted replaced
5649:c321f1fed851 5651:c968c8e3596d