5c9a0f0 Merge branch 'f14' into f13

Merged and Committed by nb 13 years ago
    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	spamassassin.spec
    
        
file modified
+2 -2
file modified
+37 -6
file modified
+21 -2
file modified
+2 -2
file modified
+11 -4