From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 27 Oct 2011 04:57:03 +0000 (-0400)
Subject: Merge branch 'develop' into feature/rewrite
X-Git-Tag: v0.8.0~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b54b3e53f601cf7b56efc7df5980a6c19bb7604;p=services%2Fpython-requests.git

Merge branch 'develop' into feature/rewrite

Conflicts:
	requests/__init__.py
---

5b54b3e53f601cf7b56efc7df5980a6c19bb7604
diff --cc requests/defaults.py
index e3f5478,770001f..90faabe
--- a/requests/defaults.py
+++ b/requests/defaults.py
@@@ -35,5 -36,4 +36,5 @@@ defaults['max_redirects'] = 3
  defaults['decode_unicode'] = True
  defaults['timeout_fallback'] = True
  # defaults['keep_alive'] = True
 -# defaults['max_connections'] = 10
 +defaults['pool_connections'] = 10
- defaults['pool_maxsize'] = 1
++defaults['pool_maxsize'] = 1