From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 3 Jan 2010 22:39:36 +0000 (+0000)
Subject: Merged revisions 77290 via svnmerge from
X-Git-Tag: v3.2a1~1900
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66c741f5fbe177d034167e69a658ec261b710f5a;p=python

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 d4099eabde..72e2096c22 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