Merged revisions 2943-3026 from stable branch.

tbrehm

2012-04-05 b67344233b509c97ba118a209e82386d698ba068

 install/tpl/config.inc.php.master

@@ -151,6 +151,8 @@
//** Default Language and Timezone
$conf['language'] = '{language}';
$conf['debug_language'] = false;

//* Complete timezone list: http://php.net/manual/en/timezones.php
$conf['timezone'] = '{timezone}';