5a5cb08 Merge branch 'f20'

Merged and Committed by gholms 9 years ago
    Merge branch 'f20'
    
    Conflicts:
    	cloud-init.spec
    
        
file modified
+0 -1
file modified
+23 -6