summaryrefslogtreecommitdiff
path: root/Misc
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2012-04-19 22:22:37 +1000
committerNick Coghlan <ncoghlan@gmail.com>2012-04-19 22:22:37 +1000
commite27b3608ef04daa5e27029c329ad426782c9670c (patch)
treefbe43a13c26c08cf642fece63e5652a90bf65574 /Misc
parentdea6c21a9c78624786cbca0f2a318208bdc4213e (diff)
parent10ac77d2d886c0921b21253b768fca8bc9b3c0dd (diff)
downloadcpython-git-e27b3608ef04daa5e27029c329ad426782c9670c.tar.gz
Merge from 3.2
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2f1604afdc..f943594c93 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1123,6 +1123,7 @@ Robert Xiao
Florent Xicluna
Hirokazu Yamamoto
Ka-Ping Yee
+Jason Yeo
Bob Yodlowski
Danny Yoo
George Yoshida
diff --git a/Misc/NEWS b/Misc/NEWS
index e5eed118c0..879dc03cce 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -121,6 +121,9 @@ Library
Tests
-----
+- Issue #14032: Fix incorrect variable name in test_cmd_line_script debugging
+ message (Patch by Jason Yeo)
+
- Issue #14589: Update certificate chain for sha256.tbs-internet.com, fixing
a test failure in test_ssl.