Merge pull request #2485 from sigmavirus24/bug/shazow/urllib3/567
authorCory Benfield <lukasaoz@gmail.com>
Thu, 12 Mar 2015 06:50:33 +0000 (06:50 +0000)
committerCory Benfield <lukasaoz@gmail.com>
Thu, 12 Mar 2015 06:50:33 +0000 (06:50 +0000)
Import urllib3's Retry location from the right place


Trivial merge