summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-13 12:02:07 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-06-13 12:02:07 (GMT)
commitedc5d20f3b3c958caa070750576f64198bc724cb (patch)
tree49860cb5a9ce4859e062d26c1d716a3b39bea4c2 /Misc
parent3898174c5481e5f5741984a177f03a55f1643faa (diff)
downloadcpython-edc5d20f3b3c958caa070750576f64198bc724cb.zip
cpython-edc5d20f3b3c958caa070750576f64198bc724cb.tar.gz
cpython-edc5d20f3b3c958caa070750576f64198bc724cb.tar.bz2
Merged revisions 81971 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81971 | mark.dickinson | 2010-06-13 13:01:34 +0100 (Sun, 13 Jun 2010) | 1 line Ezio Melotti was missing from Misc/ACKS. ........
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 892acc7..013d267 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -521,6 +521,7 @@ Craig McPheeters
Lambert Meertens
Bill van Melle
Lucas Prado Melo
+Ezio Melotti
Brian Merrell
Luke Mewburn
Mike Meyer