Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/de_system_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/client/lib/lang/en_client.lng
	interface/web/client/lib/lang/en_reseller.lng
	interface/web/login/lib/lang/de.lng
	interface/web/mail/form/mail_user.tform.php
	interface/web/mail/lib/lang/de_mail_user.lng
	interface/web/mail/lib/lang/en_mail_user.lng
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
	interface/web/sites/web_domain_edit.php
	server/cron_daily.php
	server/plugins-available/backup_plugin.inc.php