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)
commit73609fc39f973d8b0fcbf3e7298fa6088320a8da
tree57fe8844d924c2077e84b2432d9066d952d57345
parentab96fe76128c93784de1624c6f52d051bedf9db7
parenteb4af3c3f926bab0814bc492b58eead536ad6519
Merge 0.9->0.10
tools/ejabberd2prosody.lua