Merge branch 'master' into 'master'

Marius Cramer

2014-10-31 474f4595c7aa07c678dceb90d06dfecf51007dd0

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