d014f3 Merge branch 'f20' into el6

Merged and Committed by T.C. Hollingsworth 5 years ago
    Merge branch 'f20' into el6
    
    Conflicts:
    	web-assets.spec
    
        
file modified
+40 -8
file modified
+10 -3