Comparison

tools/ejabberd2prosody.lua @ 6313:8bd486b6e5ec

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 25 Jul 2014 13:02:46 +0100
parent 6284:b49540983320
child 6798:8b4c8e957211
comparison
equal deleted inserted replaced
6308:94c3cf8293a7 6313:8bd486b6e5ec