eb4be2 Merge commit '99813aab598de70ab744fe5b7478db92425c9d33' into f20

Merged and Committed by adamwill 5 years ago
    Merge commit '99813aab598de70ab744fe5b7478db92425c9d33' into f20
    
    Conflicts:
    	libselinux-rhat.patch
    	libselinux.spec
    
        
file modified
+19 -0
file modified
+4 -1