From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 03 Jan 2013 06:51:45 -0500
Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch.

---
 install/tpl/system.ini.master |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index f72bf4d..599369a 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -22,6 +22,7 @@
 dblist_phpmyadmin_link=y
 phpmyadmin_url=/phpmyadmin
 webftp_url=
+client_username_web_check_disabled=n
 
 [tools]
 
@@ -34,4 +35,8 @@
 dashboard_atom_url_reseller=http://www.ispconfig.org/atom
 dashboard_atom_url_client=http://www.ispconfig.org/atom
 monitor_key=
+tab_change_discard=n
+tab_change_warning=n
+use_loadindicator=y
+use_combobox=y
 maintenance_mode=n

--
Gitblit v1.9.1