Merged revisions 79507 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79507 | florent.xicluna | 2010-03-30 21:37:07 +0200 (mar, 30 mar 2010) | 9 lines

  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 e88db2ac0be7252dd128622cccb62f1d0baef949..3638cc0adc927f89a52d3bb4844805bd2d0c30c7 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -26,7 +26,7 @@ Jason Asbahr
 David Ascher
 Chris AtLee
 John Aycock
-Jan-Hein B"uhrman
+Jan-Hein Bührman
 Donovan Baarda
 Attila Babo
 Alfonso Baciero
@@ -158,6 +158,7 @@ Christopher A. Craig
 Laura Creighton
 Simon Cross
 Drew Csillag
+Joaquin Cuenca Abela
 John Cugini
 Tom Culliton
 Lisandro Dalcin
@@ -505,7 +506,7 @@ Damien Miller
 Chad Miller
 Jay T. Miller
 Roman Milner
-Andrii V. Mishkovskyi 
+Andrii V. Mishkovskyi
 Dustin J. Mitchell
 Dom Mitchell
 Doug Moen