From 1ca823723668e01b1b998faec5f8d8153545cfa8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 04 Apr 2011 08:22:29 -0400
Subject: [PATCH] Merged revisions 2181-2262 from stable branch.

---
 interface/lib/config.inc.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index c6250c5..84a15e6 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -50,7 +50,7 @@
 //** Database
 $conf['db_type'] = 'mysql';
 $conf['db_host'] = 'localhost';
-$conf['db_database'] = 'ispconfig3';
+$conf['db_database'] = 'ispconfig3_stable';
 $conf['db_user'] = 'root';
 $conf['db_password'] = '';
 $conf['db_charset'] = 'utf8'; // same charset as html-charset - (HTML --> MYSQL: "utf-8" --> "utf8", "iso-8859-1" --> "latin1")
@@ -132,7 +132,6 @@
 //** Default Language
 $conf['language'] = 'en';
 $conf['debug_language'] = false;
-
 
 //** Misc.
 $conf['interface_logout_url'] = ''; // example: http://www.domain.tld/

--
Gitblit v1.9.1