projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0358c20 ccedc22)
merge 3.3 (#20018)
authorBenjamin Peterson <benjamin@python.org>
Wed, 18 Dec 2013 21:37:03 +0000 (15:37 -0600)
committerBenjamin Peterson <benjamin@python.org>
Wed, 18 Dec 2013 21:37:03 +0000 (15:37 -0600)
1  2 
Lib/http/cookiejar.py patch | diff1 | diff2 | blob | history

diff --cc Lib/http/cookiejar.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.