a90700f Merge branch 'master' into f17

Merged and Committed by nb 11 years ago
    Merge branch 'master' into f17
    
        
file modified
+2 -0
clamav-update.crond clamav-update.cron
file renamed
file was renamed with no change to the file
file modified
+30 -29
file modified
+2 -2