Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-04-10 363ccfedb96d98cb6f03fd2ca44096dcb24c2c7f

 interface/web/keepalive.php

@@ -30,7 +30,7 @@

error_reporting(E_ALL|E_STRICT);

require_once('../lib/config.inc.php');
require_once('../lib/app.inc.php');
require_once '../lib/config.inc.php';
require_once '../lib/app.inc.php';

?>
?>