1dcb140 Merge branch 'master' into epel7

Merged and Committed by leigh123linux 8 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+7 -2
file modified
+1 -1