summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-07-16 12:58:29 (GMT)
committerGeorg Brandl <georg@python.org>2008-07-16 12:58:29 (GMT)
commit6ea420be258a9cae2ace06bd44946b55a3bbfc4f (patch)
treef1c2364e5a5afbb5d0685f91b74b2030972c21a5 /Misc/ACKS
parent2ee470f7f99f78348baa1e7a13007540d89d9c92 (diff)
downloadcpython-6ea420be258a9cae2ace06bd44946b55a3bbfc4f.zip
cpython-6ea420be258a9cae2ace06bd44946b55a3bbfc4f.tar.gz
cpython-6ea420be258a9cae2ace06bd44946b55a3bbfc4f.tar.bz2
Merged revisions 64982-64983,65004 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64982 | georg.brandl | 2008-07-16 01:59:15 +0200 (Wed, 16 Jul 2008) | 2 lines Move label to correct heading. ........ r64983 | georg.brandl | 2008-07-16 02:00:04 +0200 (Wed, 16 Jul 2008) | 2 lines Keep sorted. ........ r65004 | martin.v.loewis | 2008-07-16 07:28:26 +0200 (Wed, 16 Jul 2008) | 2 lines Add Antoine. ........
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS6
1 files changed, 3 insertions, 3 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0a411e7..dd658c7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -216,6 +216,7 @@ Frederik Fix
Matt Fleming
Hernán Martínez Foffani
Michael Foord
+Amaury Forgeot d'Arc
Doug Fort
John Fouhy
Martin Franklin
@@ -658,6 +659,7 @@ Frank Stajano
Oliver Steele
Greg Stein
Chris Stern
+Victor Stinner
Richard Stoakley
Peter Stoehr
Casper Stoel
@@ -770,7 +772,5 @@ Artur Zaprzala
Mike Zarnstorff
Siebren van der Zee
Uwe Zessin
-Amaury Forgeot d'Arc
-Peter Ĺstrand
Tarek ZiadŽ
-Victor Stinner
+Peter Ĺstrand