From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Tue, 30 Mar 2010 19:37:07 +0000 (+0000)
Subject: Merged revisions 79498 via svnmerge from
X-Git-Tag: v3.2a1~1294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=704ed93efb24c77a7328b7aa5cb7483bf76ab969;p=python

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

diff --git a/Misc/ACKS b/Misc/ACKS
index 2442656e56..5d493a27cf 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