26f05ae Merge branch 'master' into el6

Merged and Committed by toshio 11 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	python-requests.spec
    
        
file modified
+59 -23