3f84976 Merge branch 'f18'

Merged and Committed by pwouters 11 years ago
    Merge branch 'f18'
    
    Conflicts:
    	ca-certificates.spec
    
        
file modified
+21 -0
file modified
+8 -4
file modified
+2 -1