5ef784c Merge branch 'epel7' into f23

Merged and Committed by Rex Dieter 8 years ago
    Merge branch 'epel7' into f23
    
        
file modified
+4 -6
file modified
+53 -12
file modified
+1 -1