summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-03-30 19:37:07 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-03-30 19:37:07 (GMT)
commit704ed93efb24c77a7328b7aa5cb7483bf76ab969 (patch)
treea6b6ddb6af1026ce38ccf9416f78f02eedae50c4
parent806d8cf0e8056726580e210e1dea960d6e77c910 (diff)
downloadcpython-704ed93efb24c77a7328b7aa5cb7483bf76ab969.zip
cpython-704ed93efb24c77a7328b7aa5cb7483bf76ab969.tar.gz
cpython-704ed93efb24c77a7328b7aa5cb7483bf76ab969.tar.bz2
Merged revisions 79498 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r79498 | florent.xicluna | 2010-03-30 18:42:47 +0200 (mar, 30 mar 2010) | 2 lines fix ACKS: alphabetic order and UTF-8 ........
-rw-r--r--Misc/ACKS6
1 files changed, 3 insertions, 3 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2442656..5d493a2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -9,7 +9,6 @@ Without you, I would've stopped working on Python long ago!
PS: In the standard Python distribution, this file is encoded in UTF-8.
-Joaquin Cuenca Abela
David Abrahams
Jim Ahlstrom
Farhan Ahmad
@@ -28,7 +27,7 @@ Jason Asbahr
David Ascher
Chris AtLee
John Aycock
-Jan-Hein B"uhrman
+Jan-Hein Bührman
Donovan Baarda
Attila Babo
Alfonso Baciero
@@ -167,6 +166,7 @@ Christopher A. Craig
Laura Creighton
Simon Cross
Drew Csillag
+Joaquin Cuenca Abela
John Cugini
Tom Culliton
Brian Curtin
@@ -519,7 +519,7 @@ Damien Miller
Chad Miller
Jay T. Miller
Roman Milner
-Andrii V. Mishkovskyi
+Andrii V. Mishkovskyi
Dustin J. Mitchell
Dom Mitchell
Doug Moen