739fb6f Merge branch 'master' into f23

Merged and Committed by Colin Walters 8 years ago
    Merge branch 'master' into f23
    
    Conflicts:
    	ostree.spec
    
        
file modified
+6 -1