65325e4 Merge branch 'master' into el6

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