Comparison

tools/openfire2prosody.lua @ 7042:20ac6972b9aa

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Sat, 02 Jan 2016 20:42:53 +0000
parent 5776:bd0ff8ae98a8
child 13142:879a6a33c21b
comparison
equal deleted inserted replaced
7038:22f36a3d6369 7042:20ac6972b9aa