ffaa65 Merge branch 'f18' into el5

Merged and Committed by T.C. Hollingsworth 6 years ago
    Merge branch 'f18' into el5
    
    Conflicts:
    	web-assets.spec
    
        
file modified
+6 -2