Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 accfcafdae46cfc1cc5567ee111c63dc223b6c8e

 server/server.php

@@ -31,6 +31,8 @@
require SCRIPT_PATH."/lib/config.inc.php";
require SCRIPT_PATH."/lib/app.inc.php";

$app->setCaller('server');

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