Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-02-10 447c8380668b753c95f97ec2b87ff322e4aff002

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

?>
?>