d9c99dc Merge branch 'el6'

Merged and Committed by dchen 8 years ago
    Merge branch 'el6'
    
    Conflicts:
    	zanata-python-client.spec
    
        
file modified
+7 -5