Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/gentoo.lib.php
	install/dist/lib/opensuse.lib.php
	install/install.php
	install/update.php
	interface/lib/classes/functions.inc.php
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/lib/classes/tools_monitor.inc.php
	interface/web/admin/form/system_config.tform.php
	interface/web/dns/dns_wizard.php
	interface/web/dns/form/dns_template.tform.php
	interface/web/mail/form/mail_user.tform.php
	interface/web/monitor/lib/module.conf.php
	interface/web/monitor/show_data.php
	interface/web/remote/index.php
	interface/web/sites/database_user_edit.php
	interface/web/sites/form/database.tform.php
	interface/web/sites/form/database_user.tform.php
	interface/web/sites/list/database.list.php
	interface/web/sites/web_domain_edit.php
	interface/web/sites/web_vhost_subdomain_edit.php
	interface/web/tools/import_plesk.php
	server/cron_daily.php
	server/lib/classes/db_mysql.inc.php
	server/lib/classes/monitor_tools.inc.php
	server/mods-available/monitor_core_module.inc.php
	server/mods-available/rescue_core_module.inc.php
	server/plugins-available/apache2_plugin.inc.php
	server/plugins-available/backup_plugin.inc.php

Author: Marius Cramer

interface/web/mail/form/mail_user.tform.php

@@ -346,4 +346,5 @@
 	);
 }
 
+
 ?>