Merge branch 'feature/urllib3-backup' into feature/rewrite
authorKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 20:31:41 +0000 (16:31 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Sun, 23 Oct 2011 20:31:41 +0000 (16:31 -0400)
commite7a7615e0d7d871723cdf602cb9432c01d01a376
tree89cf9553c1aa704065efab5a7110700f9b946c2f
parent7c271a466fe557f7c883f6105728f73f29cdb293
parenta0e9b21c9da518d757bb5bd7510b50e6095de85c
Merge branch 'feature/urllib3-backup' into feature/rewrite