bcaf830 Merge branch 'epel7' into el6

Merged and Committed by richardfearn 9 years ago
    Merge branch 'epel7' into el6
    
        
file modified
+4 -0
file modified
+33 -3
file modified
+1 -1