ef772b Merge branch 'f20' into f19

Merged and Committed by mrunge 5 years ago
    Merge branch 'f20' into f19
    
    Conflicts:
    	python-kombu.spec
    
        
file modified
+6 -0
file modified
+41 -10
file modified
+1 -1