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

Simple merge