Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-31 dbf57dddf7ef07a0168ad0c1d64de0735a9c5804

 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')) {