0ad69b3 Merge branch 'master' into epel7

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