summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-04-27 19:14:15 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-04-27 19:14:15 (GMT)
commit06e34a9476f7b0cd14b1dcc023892d7193230703 (patch)
treedde60aae22a2067512784319d81e02308bc0a675 /Misc
parent05830aa4ff84c9e51b64352945f82a9991a7bb73 (diff)
downloadcpython-06e34a9476f7b0cd14b1dcc023892d7193230703.zip
cpython-06e34a9476f7b0cd14b1dcc023892d7193230703.tar.gz
cpython-06e34a9476f7b0cd14b1dcc023892d7193230703.tar.bz2
Merged revisions 80540 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80540 | antoine.pitrou | 2010-04-27 21:09:59 +0200 (mar., 27 avril 2010) | 4 lines Issue #8549: Fix compiling the _ssl extension under AIX. Patch by Sridhar Ratnakumar. ........
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 33e879f..8755409 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -623,6 +623,7 @@ Anders Qvist
Burton Radons
Brodie Rao
Antti Rasinen
+Sridhar Ratnakumar
Eric Raymond
Edward K. Ream
Chris Rebert
diff --git a/Misc/NEWS b/Misc/NEWS
index 852cc4f..2837ef9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -339,6 +339,9 @@ C-API
Library
-------
+- Issue #8549: Fix compiling the _ssl extension under AIX. Patch by
+ Sridhar Ratnakumar.
+
- Issue #6656: fix locale.format_string to handle escaped percents
and mappings.