7e10d70 Merge branch 'master' into f20

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