aac5939 Merge branch 'epel7' into el6

Merged and Committed by mizdebsk 9 years ago
    Merge branch 'epel7' into el6
    
        
file modified
+1 -5
file modified
+42 -8
file modified
+1 -1