Merge pull request #2153 from jschneier/master
authorKenneth Reitz <me@kennethreitz.org>
Sat, 2 Aug 2014 01:33:55 +0000 (21:33 -0400)
committerKenneth Reitz <me@kennethreitz.org>
Sat, 2 Aug 2014 01:33:55 +0000 (21:33 -0400)
commit35d083e1665beff39aabe47a79cd1f867b897b0c
tree3691fe43ace5c532ea5348c4dff97f62352cfc8e
parent3eb69be879063de4803f7f0152b83738a1c95ca4
parent47d0517d66e8cf5832768262221f0357ae134ad1
Merge pull request #2153 from jschneier/master

handle urllib3 api changes; closes #2045