d384c04 Merge branch 'master' of ssh://pkgs.fedoraproject.org/spamassassin

Merged and Committed by nb 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/spamassassin
    
    Conflicts:
    	spamassassin.spec
    
        
file modified
+10 -1