]> granicus.if.org Git - python/commitdiff
merge 3.4 (#22986)
authorBenjamin Peterson <benjamin@python.org>
Sat, 17 Jan 2015 01:46:37 +0000 (20:46 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sat, 17 Jan 2015 01:46:37 +0000 (20:46 -0500)
1  2 
Lib/http/cookies.py
Lib/test/test_http_cookies.py
Misc/NEWS

Simple merge
Simple merge
diff --cc Misc/NEWS
Simple merge