add option to not print ssl
add unknown and http binding connections
fix trailing newline
ejabberd_c2s_types: do not scale, minor speed improvements, ssl is non-optional
use registered_vhosts if env.hosts is not defined.
use , other fixes
Merge branch 'master' into debian

Conflicts:
	ejabberd_c2s_types
update changelog
update ejabberd_c2s_types
fix stray newline
fix labels for vhost, remove no.label
add info field to muc_count
Merge branch 'master' into debian
update changelog
fix changelog
Add lintian override for missing python helper