Merge remote-tracking branch 'upstream/master'
authorsprt <hellosprt@gmail.com>
Wed, 23 Jan 2013 13:42:45 +0000 (14:42 +0100)
committersprt <hellosprt@gmail.com>
Wed, 23 Jan 2013 13:42:45 +0000 (14:42 +0100)
commitc4ad8afba9315e13fa0488bd6977a3b2ed8e7872
tree9f25d7203be543e0b8859c764885937fc740da00
parenta721d590b4e13b641b3171a081e7d6a7b3d8b6f2
parent0c09d16b293c33ca953b646f7c844c15daf0132e
Merge remote-tracking branch 'upstream/master'

Conflicts:
requests/sessions.py
requests/models.py
requests/sessions.py
test_requests.py