b25d929 Merge branch 'el6'

Merged and Committed by jamielinux 10 years ago
    Merge branch 'el6'
    
        
file modified
+6 -1