4a1396f Merge branch 'master' of ssh://pkgs.fedoraproject.org/ca-certificates

Merged and Committed by Kai Engert 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ca-certificates
    
    Conflicts:
    	ca-certificates.spec
    
        
file modified
+6 -2