Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Till Brehm

2016-03-29 1bad88c7e5716073be876ee5cfee7a3cfe6a9eae

 server/lib/classes/aps_base.inc.php

@@ -65,7 +65,7 @@
      $this->log_prefix = $log_prefix;
      $this->interface_mode = $interface_mode;
      $this->fetch_url = 'apscatalog.com';
      $this->aps_version = '1';
      $this->aps_version = '1.2';
      $this->packages_dir = ISPC_ROOT_PATH.'/aps_packages';
      $this->interface_pkg_dir = ISPC_ROOT_PATH.'/web/sites/aps_meta_packages';
   }