undefined ejabberd_socket:get_conn_type/1
Let ejabberdctl accept binary string arguments

Don't print the following message if an ejabberd command expects binary
string arguments: "This command cannot be executed using ejabberdctl.
Try ejabberd_xmlrpc."
Convert README to Markdown

Use Markdown syntax for the README file and add a README.md symlink, so
that a certain popular Git hosting site renders it nicely.
Merge pull request #189 from weiss/markdown-readme

Convert README to Markdown
mod_register_web should response 404 instead of process crash.
fix error handling when sql calling with unknown host.
Merge pull request #187 from weiss/fix-ejabberdctl-output

Let ejabberdctl accept binary string arguments
Merge pull request #190 from hamano/mod_register_web_response_404

mod_register_web should response 404 instead of process crash.
Merge pull request #191 from hamano/added_get_random_pid_error_handling

fix error handling when sql calling with unknown host.
Fix formatting string argument (thanks to Locojay)(github #129)
Fix error reporting in previous commit
SIP support

Conflicts:
	configure
	configure.ac
	doc/guide.tex
Merge pull request #178 from hamano/devel

undefined ejabberd_socket:get_conn_type/1
fix ejabberd_system_monitor:s2s_out_info/1 error
Merge pull request #192 from hamano/fix_ejabberd_system_monitor_error

fix ejabberd_system_monitor:s2s_out_info/1 error
Locate sessions by proxy processes directly
Multiple REGISTER bindings support
Move some code in a separate function
Process gen_server timeouts correctly
Check for 'max_user_sessions' option