]> granicus.if.org Git - python/commitdiff
Merge #11401 fix from 3.1.
authorR David Murray <rdmurray@bitdance.com>
Wed, 16 Mar 2011 22:27:34 +0000 (18:27 -0400)
committerR David Murray <rdmurray@bitdance.com>
Wed, 16 Mar 2011 22:27:34 +0000 (18:27 -0400)
1  2 
Lib/email/header.py
Lib/email/test/test_email.py
Misc/NEWS

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