From: sprt <hellosprt@gmail.com>
Date: Wed, 23 Jan 2013 13:42:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.2.0~68^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4ad8afba9315e13fa0488bd6977a3b2ed8e7872;p=services%2Fpython-requests.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	requests/sessions.py
---

c4ad8afba9315e13fa0488bd6977a3b2ed8e7872