ba94a7 Merge branch 'master' into el6

Merged and Committed by Ionuț C. Arțăriși 9 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-tornado.spec
    	sources
    
        
file modified
+1 -0
file modified
+18 -5
file modified
+1 -1