921475f Merge branch 'master' into epel7

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