Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2014-06-04 fac03aa97013f819bbc6c201d107ebfc4fab4e18

 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';