Merge branch 'master' into 'master'

Marius Cramer

2014-01-27 e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c

 interface/web/remote/index.php

@@ -1,8 +1,8 @@
<?php

require_once('../../lib/config.inc.php');
require_once '../../lib/config.inc.php';
$conf['start_session'] = false;
require_once('../../lib/app.inc.php');
require_once '../../lib/app.inc.php';

if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');

@@ -12,4 +12,4 @@
$server->setObject(new ISPConfigSoapHandler());
$server->handle();

?>
?>