Merge branch 'dns-dnssec-fix-dbmaster' into 'stable-3.1'

Till Brehm

2016-04-12 c92a4ee47ce5a7bb6b0e32a321ce09fece3e11dc

 server/lib/classes/cron.d/100-monitor_clamav_log.inc.php

@@ -129,7 +129,7 @@
      $clamav_outdated_warning = false;
      $clamav_bytecode_updated = false;
      foreach ($lastLog as $line) {
         if (stristr($line,'outdated')) {
         if (stristr($line,"Can't download daily.cvd from")) {
            $clamav_outdated_warning = true;
         }
         if(stristr($line,'main.cld is up to date')) {