Merge branch 'master' into 'master'

Marius Cramer

2014-02-25 0e3e3c99217c80068fe620460c7a331c34fe1b40

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

@@ -145,7 +145,7 @@
      
      //* Warn when clamav is outdated and main.cld update failed.
      if($clamav_outdated_warning == true && $clamav_bytecode_updated == false) {
         $state = $this->_setState($state, 'info');
         $state = $this->_tools->_setState($state, 'info');
      }

      $res = array();