Comparison

tools/ejabberd2prosody.lua @ 6163:7a8899d314d7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 06 May 2014 00:37:08 +0200
parent 6027:8c69cea8a1bf
child 6284:b49540983320
comparison
equal deleted inserted replaced
6157:44de98f516f5 6163:7a8899d314d7