Merge branch 'master' into 'master'

Marius Cramer

2014-02-14 e100328a7f3d495dfddf71f7c71f24ac14bfd9a0

 interface/web/remote/json.php

@@ -1,11 +1,11 @@
<?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';

$app->load('json_handler');
$json_handler = new ISPConfigJSONHandler();
$json_handler->run();

?>
?>