Comparison

prosody.cfg.lua.dist @ 5645:ae079d57af2e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 05 Jun 2013 21:36:29 +0100
parent 5624:187f734bc996
child 5806:c914f4322581
comparison
equal deleted inserted replaced
5641:92ffddd02c96 5645:ae079d57af2e