merge conflict
authorKenneth Reitz <me@kennethreitz.com>
Mon, 23 Apr 2012 02:26:53 +0000 (22:26 -0400)
committerKenneth Reitz <me@kennethreitz.com>
Mon, 23 Apr 2012 02:26:53 +0000 (22:26 -0400)
commita7da521a62b248b999b856594ad68c82fac9f498
treed49da0ed9fb8d40eadd2c8da7a1c3cb01c1b3c95
parent2621fe2bff136f62a158100010649c4f15f40154
merge conflict
requests/utils.py