[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#20018)

[benjamin.peterson]

http://hg.python.org/cpython/rev/5f5e1d408c0c
changeset:   88050:5f5e1d408c0c
parent:      88047:ce89c5c3c786
parent:      88048:656a40666937
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Dec 18 15:37:03 2013 -0600
summary:
  merge 3.3 (#20018)

files:
  Lib/http/cookiejar.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -1973,7 +1973,7 @@
     magic_re = re.compile("#( Netscape)? HTTP Cookie File")
     header = """\
 # Netscape HTTP Cookie File
-# http://www.netscape.com/newsref/std/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This is a generated file!  Do not edit.
 
 """

-- 
Repository URL: http://hg.python.org/cpython