Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 server/lib/classes/system.inc.php

@@ -1803,7 +1803,9 @@

   function mount_backup_dir($backup_dir, $mount_cmd = '/usr/local/ispconfig/server/scripts/backup_dir_mount.sh'){
      global $app, $conf;

		
      if($this->is_mounted($backup_dir)) return true;
		
      $mounted = true;
      if (    is_file($mount_cmd) &&
            is_executable($mount_cmd) &&