2bf28cc Merge branch 'master' into f20

Merged and Committed by kubo 9 years ago
    Merge branch 'master' into f20
    
    Conflicts:
    	.gitignore
    	sources
    	vertica-python.spec
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+15 -2