466207b Merge commit 'd0fdb0d759b960b41b57bf7c9539901f16062e0a' into f25

Merged and Committed by Orion Poplawski 7 years ago
    Merge commit 'd0fdb0d759b960b41b57bf7c9539901f16062e0a' into f25
    
    Conflicts:
    	python-rpm-macros.spec
    
        
file modified
+65 -43
file modified
+26 -5
file modified
+26 -5
file modified
+17 -7