summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-23 01:30:26 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-23 01:30:26 (GMT)
commit87e2074ecb1394d7a123151432813bf608247f9c (patch)
tree643199c7b74afad6ac0aaf6970f0d7d7457a68c3 /Misc/ACKS
parent0dedf451428c174db89963a74e6c230420c811e4 (diff)
downloadcpython-87e2074ecb1394d7a123151432813bf608247f9c.zip
cpython-87e2074ecb1394d7a123151432813bf608247f9c.tar.gz
cpython-87e2074ecb1394d7a123151432813bf608247f9c.tar.bz2
Merged revisions 72835 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72835 | r.david.murray | 2009-05-22 20:48:58 -0400 (Fri, 22 May 2009) | 4 lines Fix Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns the socket. Patch by Farhan Ahmad, test by Marcin Bachry. ........
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 8a86f73..f14d45d 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -11,6 +11,7 @@ PS: In the standard Python distribution, this file is encoded in Latin-1.
David Abrahams
Jim Ahlstrom
+Farhan Ahmad
Jyrki Alakuijala
Billy G. Allie
Kevin Altis
@@ -28,6 +29,7 @@ Jan-Hein B"uhrman
Donovan Baarda
Attila Babo
Alfonso Baciero
+Marcin Bachry
Dwayne Bailey
Stig Bakken
Greg Ball