Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 26 Aug 2015 11:17:10 +0000 (13:17 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 26 Aug 2015 11:17:10 +0000 (13:17 +0200)
1  2 
tools/ejabberd2prosody.lua

Simple merge