summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-03 22:39:36 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-03 22:39:36 (GMT)
commit66c741f5fbe177d034167e69a658ec261b710f5a (patch)
treeb2391d5880fe3932a583cfc25dc3109ca983b142 /Misc/ACKS
parentb1f8835b213411d059d0e2ba4b78125328afeee6 (diff)
downloadcpython-66c741f5fbe177d034167e69a658ec261b710f5a.zip
cpython-66c741f5fbe177d034167e69a658ec261b710f5a.tar.gz
cpython-66c741f5fbe177d034167e69a658ec261b710f5a.tar.bz2
Merged revisions 77290 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77290 | antoine.pitrou | 2010-01-03 23:38:50 +0100 (dim., 03 janv. 2010) | 3 lines Credit Nir Aides for r77288 ........
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index d4099ea..72e2096 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -12,6 +12,7 @@ PS: In the standard Python distribution, this file is encoded in UTF-8.
David Abrahams
Jim Ahlstrom
Farhan Ahmad
+Nir Aides
Jyrki Alakuijala
Billy G. Allie
Kevin Altis