3a17d9 Merge branch 'users/tzimmermann/SLE12-SP5/for-next' into SLE12-SP5

Merged and Committed by Ivan T. Ivanov 10 months ago
    Merge branch 'users/tzimmermann/SLE12-SP5/for-next' into SLE12-SP5
    
    Resolve conflict in blacklist.conf
    
        
file modified
+32 -0