Conflicts:
	TODO.txt
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/tpl/fedora_dovecot2.conf.master
	interface/lib/config.inc.php
	interface/web/admin/lib/lang/el_system_config.lng
	interface/web/client/lib/lang/fr_reseller.lng
	interface/web/dns/lib/lang/fr_dns_import.lng
	interface/web/dns/lib/lang/fr_dns_soa.lng
	interface/web/dns/lib/lang/fr_dns_wizard.lng
	interface/web/mail/lib/lang/fr_mail_user.lng
	interface/web/monitor/lib/lang/fr.lng
	interface/web/sites/lib/lang/el_web_childdomain.lng
	interface/web/sites/lib/lang/el_web_childdomain_list.lng
	interface/web/sites/lib/lang/el_web_subdomain.lng
	interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
	interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
	interface/web/sites/lib/lang/fr_web_aliasdomain.lng
	interface/web/sites/lib/lang/fr_web_subdomain.lng
	interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
	interface/web/themes/blue/ispconfig_version
	ser...

Fixed: FS#3440 - after each install/reconfigure: warning: database /var/lib/mailman/data/virtual-mailman.db is older

- Added missing option in centos dovecot.conf file

Conflicts:
	install/sql/incremental/upd_0073.sql

Conflicts:
	install/sql/incremental/upd_0073.sql
	install/sql/ispconfig3.sql

Conflicts:
	interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
	interface/web/mail/lib/lang/de_mail_get.lng
	interface/web/sites/lib/lang/de_cron.lng
	interface/web/sites/lib/lang/en_cron.lng
	interface/web/sites/web_vhost_subdomain_edit.php

- Enable php-fpm socket mode as default.

- changed/harmonized order of clients in client select fields ("ORDER BY client.company_name, client.contact_name, sys_group.name")

Conflicts:
	interface/web/sites/form/web_vhost_domain.tform.php