Merge branch 'master' into 'master'

Marius Cramer

2015-09-04 842b5c34e70869b7b1a0d368cbb6280f737301d3

 server/lib/classes/cron.d/500-backup_mail.inc.php

@@ -54,7 +54,7 @@
      $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
      $global_config = $app->getconf->get_global_config('sites');
      
      $backup_dir = $server_config['backup_dir'];
      $backup_dir = trim($server_config['backup_dir']);
      $backup_dir_permissions =0750;

      $backup_mode = $server_config['backup_mode'];