2d28e30 Merge branch 'master' into f19

Merged and Committed by Colin Walters 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	ostree.spec
    
        
file modified
+1 -0
file modified
+26 -19
file modified
+1 -1