Merge branch 'master' of github.com:kennethreitz/requests
authorKenneth Reitz <me@kennethreitz.com>
Thu, 29 Nov 2012 16:35:35 +0000 (08:35 -0800)
committerKenneth Reitz <me@kennethreitz.com>
Thu, 29 Nov 2012 16:35:35 +0000 (08:35 -0800)
commita5cb6355edd67e25a4a213a3559f9da4ba8d44fc
treef6f2cbbd377c2ec92eacd530faedb5deee8b6f68
parent6ead850065189a094687894168abcf99cabe7f02
parent8f86ff633a2646442f2d8976046b5c0025e772c1
Merge branch 'master' of github.com:kennethreitz/requests

Conflicts:
requests/compat.py
setup.py
requests/compat.py
setup.py