review.tizen.org Git - services/python-requests.git/commit

projects / services / python-requests.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ceec572 cb0fdd8)

author	Ian Cordasco <graffatcolmingov@gmail.com>
	Sat, 18 Aug 2012 16:15:03 +0000 (12:15 -0400)
committer	Ian Cordasco <graffatcolmingov@gmail.com>
	Sat, 18 Aug 2012 16:15:03 +0000 (12:15 -0400)
commit	e02da89337e798a39bc29dfa6e0ceb8636b6761c
tree	2665f21ed2008ef013201546b98ce271bf256aad	tree \| snapshot
parent	ceec572cb97515c2078f26d5a909f8b99f525183	commit \| diff
parent	cb0fdd80d0b3019d08f2ec73eb1b25dc79eb9608	commit \| diff

Merge branch 'develop' into key_val_lists

Conflicts:
requests/models.py
tests/test_requests.py

Remove some of Lukasa's duplication of my efforts in _encode_data.

requests/models.py	diff1 \|	diff2 \|	blob \| history
requests/sessions.py	diff1 \|	diff2 \|	blob \| history
requests/utils.py	diff1 \|	diff2 \|	blob \| history
tests/test_requests.py	diff1 \|	diff2 \|	blob \| history

Domain: SCM / CI Services;