From: R David Murray <rdmurray@bitdance.com>
Date: Sun, 3 Jul 2011 01:10:44 +0000 (-0400)
Subject: merge #12147: make send_message correctly handle Sender and Resent- headers.
X-Git-Tag: v3.3.0a1~1980^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db4120bf9d7ea434b27ad531cd33ed4987b6dcf3;p=thirdparty%2FPython%2Fcpython.git

merge #12147: make send_message correctly handle Sender and Resent- headers.
---

db4120bf9d7ea434b27ad531cd33ed4987b6dcf3
diff --cc Lib/smtplib.py
index f9d1c99bb467,9080e4ae5709..b89b5a5114f0
mode 100755,100644..100644
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
diff --cc Misc/ACKS
index f6faa1822b0a,45b4042fa9a9..3fb0d9d32133
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -276,8 -264,8 +276,9 @@@ Jürgen A. Erhar
  Michael Ernst
  Ben Escoto
  Andy Eskilsson
 +André Espaze
  Stefan Esser
+ Nicolas Estibals
  Stephen D Evans
  Carey Evans
  Tim Everett