Merge branch 'master' into develop

Conflicts:
	AUTHORS
	HISTORY.rst
	requests/api.py
	requests/core.py
	requests/models.py
	test_requests.py

diff --cc AUTHORS
index 407198f9616ddb0759bc037650e5786cbfdd82df,8dccb4619eca7520e709d1f91d6b5d5519ea0e7f..0159cdef797977560a07949680b2418f01627d6c
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -45,10 -39,4 +45,11 @@@ Patches and Suggestion
  - Shrikant Sharat Kandula
  - Mikko Ohtamaa
  - Den Shabalin
 +- Alejandro Giacometti
 +- Rick Mak
 +- Johan Bergström
 +- Josselin Jacquard
 +- Michael Van Veen <michael@mvanveen.net>
 +- Mike Waldner
 +- Serge Domkowski
+ - Daniel Miller <danielm@vs-networks.com>

diff --cc HISTORY.rst
index 5e976e8268b6bdf1811ece09e03ce327cee9565e,fbd4a72620c65f8d6c31ff4e5783c39f27b01fd6..a115f700044f2731621908234658651a7fa3c4bb
--- 1/HISTORY.rst
--- 2/HISTORY.rst
+++ b/HISTORY.rst
@@@ -1,16 -1,12 +1,25 @@@
  History
  -------
  
++0.7.0 (??)
++++++++++++
++
 +* Automatic decoding of unicode, based on HTTP Headers.
 +* New ``decode_unicode`` setting
 +* Removal of ``r.read/close`` methods
 +* New ``r.fo`` interface for advanced response usage.*
 +* Automatic expansion of parameterized headers
 +* Turn off Redirects for GET/HEAD requests
 +* Fix for Python Pre-2.7 URL quoting (http://bugs.python.org/issue918368)
 +* New ``r.iter_content`` method
 +
 +
+ 0.6.2 (2011-10-09)
+ ++++++++++++++++++
+ 
+ * GET/HEAD obeys follow_redirect=False
+ 
+ 
  0.6.1 (2011-08-20)
  ++++++++++++++++++