Merged these revisions from trunk: 2153-2164,2166,2168,2171

tbrehm

2011-01-11 04620b7ff00c194ae1bf4c398ebcb26d5c950b6a

 server/server.php

@@ -32,7 +32,7 @@
require('lib/app.inc.php');

set_time_limit(0);
ini_set('error_reporting','E_ALL & ~E_NOTICE');
ini_set('error_reporting',E_ALL & ~E_NOTICE);

// make sure server_id is always an int
$conf['server_id'] = intval($conf['server_id']);