9023c96 Merge remote-tracking branch 'origin/master' into el6

Merged and Committed by stevejenkins 9 years ago
    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	opendkim.spec
    	sources
    
        
file modified
+4 -0
file modified
+155 -0
file modified
+5 -0