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/index.php
	interface/web/sites/database_edit.php
	interface/web/sites/form/database.tform.php
	interface/web/sites/form/web_vhost_subdomain.tform.php
	interface/web/sites/lib/lang/ar_web_childdomain_list.lng
	interface/web/sites/lib/lang/ar_web_vhost_domain_list.lng
	interface/web/sites/lib/lang/cz_web_childdomain.lng
	interface/web/sites/lib/lang/cz_web_subdomain.lng
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
	interface/web/sites/lib/lang/de_ftp_user.lng
	interface/web/sites/lib/lang/de_shell_user.lng
	interface/web/sites/lib/lang/en_ftp_user.lng
	interface/web/sites/lib/lang/en_web_childdomain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	interface/web/sites/lib/lang/es_ftp_user.lng
	interface/web/sites/lib/lang/es_shell_user.lng
	interface/web/sites/lib/lang/es_web_domain.lng
	interface/web/sites/lib/lang/fr_web_subdomain.lng
	interface/web/sites/lib/lang/hr_web_aliasdomain.lng
	interface/web/sites/lib/lang/hr_web_subdomain.lng
	interface/web/sites/lib/lang/hr_web_subdomain_list.lng
	interface/web/sites/lib/lang/hr_web_vhost_domain.lng
	interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
	interface/web/sites/lib/lang/se_web_subdomain.lng
	interface/web/sites/lib/lang/se_web_subdomain_list.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
	interface/web/sites/web_aliasdomain_edit.php
	interface/web/sites/web_domain_edit.php
	interface/web/sites/web_vhost_subdomain_edit.php
	interface/web/themes/blue/ispconfig_version
	interface/web/themes/default-304/templates/admin/server_config_mail_edit.htm
	interface/web/themes/default-304/templates/admin/system_config_sites_edit.htm
	interface/web/themes/default-304/templates/dns/dns_wizard.htm
	interface/web/themes/default-304/templates/mail/spamfilter_config_mail_edit.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_advanced.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_backup.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_redirect.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_ssl.htm
	interface/web/themes/default-304/templates/sites/web_vhost_subdomain_stats.htm
	server/conf/vhost.conf.master
	server/cron_daily.php
	server/lib/classes/db_mysql.inc.php
	server/mods-available/monitor_core_module.inc.php