Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2015-01-05 9ca1e3b8acc34e15ff4bdbdd4b61402da06b4227

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

?>
?>