cb2b823 Merge branch 'master' into f21

Merged and Committed by peter 9 years ago
    Merge branch 'master' into f21
    
    Conflicts:
    	ca-certificates.spec
    
        
file modified
+5 -1