Comparison

tools/ejabberd2prosody.lua @ 6560:6f39c58bdcc4

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 26 Jan 2015 15:27:19 +0100
parent 6284:b49540983320
child 6798:8b4c8e957211
comparison
equal deleted inserted replaced
6557:8aa967c81cbc 6560:6f39c58bdcc4