summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-25 21:17:21 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-25 21:17:21 (GMT)
commitec42975bc66706554ae29b3884bdaaa6b26c487c (patch)
tree4e7f428e153c53dcb9ccab73d3b99d1ffcfbda7b /Misc
parent7eaf3f7080a0b0e1e551d2d9d2dcddd54d53af59 (diff)
parent4f1353ab10792f47a51c37f1384f036a1679aec0 (diff)
downloadcpython-ec42975bc66706554ae29b3884bdaaa6b26c487c.zip
cpython-ec42975bc66706554ae29b3884bdaaa6b26c487c.tar.gz
cpython-ec42975bc66706554ae29b3884bdaaa6b26c487c.tar.bz2
#18833: merge with 3.3.
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 a947e4b..e7edc25 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1324,6 +1324,7 @@ Norman Vine
Pauli Virtanen
Frank Visser
Johannes Vogel
+Alex Volkov
Martijn Vries
Sjoerd de Vries
Niki W. Waibel