4c7b74f Merge branch 'f25'

Merged and Committed by gholms 7 years ago
    Merge branch 'f25'
    
    Conflicts:
    	cloud-init.spec
    
        
file modified
+1 -1