159794e Merge branch 'master' into f19

Merged and Committed by pwouters 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	.gitignore
    	opendnssec.spec
    	sources
    
        
file modified
+2 -0
file modified
+9 -3
file modified
+1 -1