Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Falko Timme

2014-03-05 52983de57cf6d60fbd37b0c8e873aae4f69da10d

 interface/lib/config.inc.php

@@ -139,6 +139,7 @@
//** Default Language
$conf['language'] = 'en';
$conf['debug_language'] = false;
$conf['language_file_import_enabled'] = true; // Bool value: true / false

//** Default Country
$conf['country'] = 'DE';