f4f2c2a Merge branch 'master' into epel7

Merged and Committed by germano 5 years ago
    Merge branch 'master' into epel7
    
        
file modified
+7 -0
file modified
+156 -16
file modified
+1 -1