Merge branch 'master' of github.com:dsoprea/requests
authorCory Benfield <lukasaoz@gmail.com>
Thu, 9 Jan 2014 19:46:32 +0000 (19:46 +0000)
committerCory Benfield <lukasaoz@gmail.com>
Thu, 9 Jan 2014 19:46:32 +0000 (19:46 +0000)
commit098865122c040ed87e57c4f2f1b0b146f51448a1
treef22e50b8d219f8e20a4060285ac0038032e7d570
parent1720e4bb87f5db29e9d9f42da1b0cbb1f52a7171
parent3ccdfce2e5e7e85b5e5628788f440570f9306242
Merge branch 'master' of github.com:dsoprea/requests

Conflicts:
docs/user/advanced.rst
docs/user/advanced.rst