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
........

diff --git a/Misc/ACKS b/Misc/ACKS
index d4099eabde5b1b6e46ab556170c813bcbdcd1697..72e2096c22cd9999fdc484d9391d42d6e848aeee 100644 (file)
--- 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