Conflicts:
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.master
	install/uninstall.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mailuser/lib/lang/de_mail_user_cc.lng
	interface/web/sites/aps_install_package.php
	interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
	interface/web/sites/web_vhost_domain_edit.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/cron_daily.php
	server/lib/classes/monitor_tools.inc.php