547e0a7 Merge branch 'f20' into epel7

Merged and Committed by cicku 9 years ago
1 file changed. 10 lines added. 7 lines removed.
    Merge branch 'f20' into epel7
    
        
file modified
+10 -7