3068d86 Merge branch 'master' into el6-havana

Merged and Committed by Jakub Ruzicka 10 years ago
    Merge branch 'master' into el6-havana
    
    Conflicts:
    	python-heatclient.spec
    
        
file modified
+1 -0
file modified
+17 -6
file modified
+1 -1