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

Florian Schaal

2016-02-10 42e4c6e34d9ba18eebf16ef3b0c0af290c3d58d1

 server/lib/classes/system.inc.php

@@ -44,7 +44,7 @@
    */


   public function system(){
   public function __construct(){
      //global $go_info;
      //$this->server_id = $go_info['isp']['server_id'];
      //$this->server_conf = $go_info['isp']['server_conf'];