summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-07-23 02:32:17 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-07-23 02:32:17 (GMT)
commit392bfd30af8cf87801c724d5964f4b5b088b025d (patch)
tree6f1599939611894a9a3f9e4c4b53938c8d56b9ea /Misc
parentd74062948d890ca787721dbefd3ab8caf518c554 (diff)
parent970bef295d390c5ceaedca0f095590cd381a3331 (diff)
downloadcpython-392bfd30af8cf87801c724d5964f4b5b088b025d.zip
cpython-392bfd30af8cf87801c724d5964f4b5b088b025d.tar.gz
cpython-392bfd30af8cf87801c724d5964f4b5b088b025d.tar.bz2
merge heads.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b9ee301..d373424 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,9 @@ Core and Builtins
Library
-------
+- Issue #15232: when mangle_from is True, email.Generator now correctly mangles
+ lines that start with 'From' that occur in a MIME preamble or epilogue.
+
- Issue #15094: Incorrectly placed #endif in _tkinter.c.
Patch by Serhiy Storchaka.