Merge: #17369: Improve handling of broken RFC2231 values in get_filename.

author R David Murray <rdmurray@bitdance.com>

Fri, 7 Feb 2014 20:04:26 +0000 (15:04 -0500)

committer R David Murray <rdmurray@bitdance.com>

Fri, 7 Feb 2014 20:04:26 +0000 (15:04 -0500)
author R David Murray <rdmurray@bitdance.com>
Fri, 7 Feb 2014 20:04:26 +0000 (15:04 -0500)
committer R David Murray <rdmurray@bitdance.com>
Fri, 7 Feb 2014 20:04:26 +0000 (15:04 -0500)
diff --cc Lib/email/utils.py
Simple merge
diff --cc Lib/test/test_email/test_email.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Fri, 7 Feb 2014 20:04:26 +0000 (15:04 -0500)
committer	R David Murray <rdmurray@bitdance.com>
	Fri, 7 Feb 2014 20:04:26 +0000 (15:04 -0500)
		1	2
Lib/email/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_email/test_email.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history