7534201 Merge branch 'epel7' into f20

Merged and Committed by epienbro 9 years ago
    Merge branch 'epel7' into f20
    
        
file modified
+17 -5
file modified
+1 -1