Conflicts:
	install/autoupdate.php
	install/install.php
	install/sql/incremental/upd_0078.sql
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.master
	interface/lib/classes/db_mysql.inc.php
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/tform.inc.php
	interface/lib/classes/validate_reseller.inc.php
	interface/lib/config.inc.php
	interface/lib/lang/es.lng
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/admin/lib/lang/es_server_config.lng
	interface/web/admin/lib/lang/fr_server_config.lng
	interface/web/admin/lib/lang/hr_server_config.lng
	interface/web/dns/lib/lang/hr_dns_wizard.lng
	interface/web/mail/lib/lang/hr_mail_user.lng
	interface/web/mail/mail_domain_edit.php
	interface/web/mail/mail_user_edit.php
	interface/web/remote/i...