72a35e5 Merge branch 'f21'

Merged and Committed by twaugh 6 years ago
    Merge branch 'f21'
    
    Conflicts:
    	cups-systemd-socket.patch
    	cups.spec
    
        
file modified
+15 -13
file modified
+4 -1