6804a57 Merge branch 'master' into f12

Merged and Committed by nb 13 years ago
    Merge branch 'master' into f12
    
    Conflicts:
    	clamav-milter.upstart
    	clamav.spec
    	clamd.scan.upstart
    	lastver
    
        
file modified
+5 -6
file modified
+57 -28
file modified
+7 -7
file modified
+1 -1
file modified
+1 -1