summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-03-30 19:46:42 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-03-30 19:46:42 (GMT)
commit08e685a7ecbff2cf1aeae92cc8717bde32baf94a (patch)
treefb47ac28b789ef5329cc6baca2ef4df8bf581627 /Misc/ACKS
parent8935ed952485587bf43cd4e0e15323900df84770 (diff)
downloadcpython-08e685a7ecbff2cf1aeae92cc8717bde32baf94a.zip
cpython-08e685a7ecbff2cf1aeae92cc8717bde32baf94a.tar.gz
cpython-08e685a7ecbff2cf1aeae92cc8717bde32baf94a.tar.bz2
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 ........ ................
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS5
1 files changed, 3 insertions, 2 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e88db2a..3638cc0 100644
--- 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