29a02ac Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-requests into el6

Merged and Committed by ralph 11 years ago
    Merge branch 'el6' of ssh://pkgs.fedoraproject.org/python-requests into el6
    
    Conflicts:
    	python-requests.spec
    
        
file modified
+0 -6