a521528 Merge branch 'f24' into epel7

Merged and Committed by Rex Dieter 8 years ago
    Merge branch 'f24' into epel7
    
        
file modified
+17 -8