4ddc1ce Merge branch 'master' into epel7

Merged and Committed by ohaessler 7 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+4 -1