summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-13 11:07:57 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-06-13 11:07:57 (GMT)
commit3898174c5481e5f5741984a177f03a55f1643faa (patch)
tree7a6572a81f7aae890236ddb061c8877591a9a97a /Misc
parentbcdf9da26581266a35a2c7adc835c4580177c1ec (diff)
downloadcpython-3898174c5481e5f5741984a177f03a55f1643faa.zip
cpython-3898174c5481e5f5741984a177f03a55f1643faa.tar.gz
cpython-3898174c5481e5f5741984a177f03a55f1643faa.tar.bz2
Merged revisions 81969 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81969 | mark.dickinson | 2010-06-13 12:07:00 +0100 (Sun, 13 Jun 2010) | 1 line Add Éric Araujo to Misc/ACKS for doc work and many patch and commit reviews. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 9795219..892acc7 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -25,6 +25,7 @@ John Anderson
Erik Andersén
Oliver Andrich
Ross Andrus
+Éric Araujo
Jason Asbahr
David Ascher
Chris AtLee