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
	server/plugins-available/apache2_plugin.inc.php
	server/plugins-available/nginx_plugin.inc.php