Automated merge.

Automated merge.

Make ejabberd2prosody.lua a little more cross-platform :)

Make ejabberd2prosody.lua eecutable

Automated merge with http://waqas.ath.cx/

ejabberd db dump importer for Prosody

More Makefile improvements (install the certificates, and update the config on install to find them)

(0) -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 tip

mercurial