60f9b4c Merge branch 'master' into epel7

Merged and Committed by lholecek 6 years ago
    Merge branch 'master' into epel7
    
        
file modified
+5 -1
file modified
+1 -1