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)

Trivial merge