90eb74f
Merge branch 'f18' of ssh://pkgs.fedoraproject.org/python-requests into f18 Conflicts: python-requests.spec