Merge branch 'stable-3.1'

Marius Burkard

2016-05-04 c3189ce6c7301c3ec17878fd3918f31d0d3cb18a

 interface/lib/classes/plugin_backuplist_mail.inc.php

@@ -75,7 +75,7 @@
            if($tmp['number'] == 0) {
               $message .= $wb['delete_info_txt'];
               $sql =    "INSERT INTO sys_remoteaction (server_id, tstamp, action_type, action_param, action_state, response) " .
               "VALUES (?, ?, 'backup_delete_mail, ?, 'pending', '')";
               "VALUES (?, ?, 'backup_delete_mail', ?, 'pending', '')";
               $app->db->query($sql, $this->form->dataRecord['server_id'], time(), $backup_id);
            } else {
               $error .= $wb['delete_pending_txt'];