256800 Merge branch 'f19' into f20

Merged and Committed by twaugh 5 years ago
    Merge branch 'f19' into f20
    
    Conflicts:
    	cups.spec
    
        
file modified
+7 -1