summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-09-23 02:44:21 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-09-23 02:44:21 (GMT)
commit21df71ae8e9f7ed1a0f3de6923fa30961ac15888 (patch)
tree76d58f042a520acf4b44bbd83bc38a06798a0c4e /Misc/ACKS
parent49a29571e98a8268ef7847a746b66831c3052e68 (diff)
parenteb83ffe1b3ffda0179b83244a4c25afe367c1b4d (diff)
downloadcpython-21df71ae8e9f7ed1a0f3de6923fa30961ac15888.zip
cpython-21df71ae8e9f7ed1a0f3de6923fa30961ac15888.tar.gz
cpython-21df71ae8e9f7ed1a0f3de6923fa30961ac15888.tar.bz2
merge 3.4 (#22459)
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index c49bf42..0dd173a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -298,6 +298,7 @@ Drew Csillag
Joaquin Cuenca Abela
John Cugini
Tom Culliton
+Raúl Cumplido
Antonio Cuni
Brian Curtin
Lisandro Dalcin