Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sat, 21 Jun 2014 13:05:21 +0000 (15:05 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 21 Jun 2014 13:05:21 +0000 (15:05 +0200)
1  2 
tools/ejabberd2prosody.lua

Simple merge