40605bb Merge branch 'master' into f20

Merged and Committed by slagle 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	diskimage-builder.spec
    	sources
    
        
file modified
+2 -0
file modified
+12 -1
file modified
+1 -0