Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Mon, 3 Feb 2014 06:23:33 +0000 (07:23 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 3 Feb 2014 06:23:33 +0000 (07:23 +0100)
1  2 
tools/ejabberd2prosody.lua

Simple merge