7026dd Merge branch 'users/oneukum/SLE12-SP5/for-next' into SLE12-SP5

Merged and Committed by Ivan T. Ivanov a year ago
    Merge branch 'users/oneukum/SLE12-SP5/for-next' into SLE12-SP5
    
    Fix conflicts in blacklist.conf
    
        
file modified
+4 -0
file modified
+12 -0