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)
commit548f3fecbe593bd11ffdf6758ea3ea37fa226761
tree22596621ad7b4f8f6dc3a9975c6ad044d4ebb992
parent321c29ccb4283b31bfde2cedf225648c82095526
parentfe6a98b8055404bd2250b1ebb1fd84bc49999036
Merge 0.9->0.10
tools/ejabberd2prosody.lua