summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-12-23 00:38:32 (GMT)
committerBrett Cannon <brett@python.org>2012-12-23 00:38:32 (GMT)
commit2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da (patch)
treef9353ef041ed41113fce0c3eec3f6bfac83b537f /Misc/ACKS
parenta81ef640f1fcc4b8378bc6887b4ba989a1eae4c5 (diff)
parent73b969ec70ff4d422bff34d63cfb220cfac96779 (diff)
downloadcpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.zip
cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.tar.gz
cpython-2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da.tar.bz2
merge with 3.3
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS4
1 files changed, 1 insertions, 3 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index aa95d4d..90894a0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -901,15 +901,13 @@ William Park
Harri Pasanen
Gaël Pasgrimaud
Ashish Nitin Patil
-Berker Peksag
-Bo Peng
-Joe Peterson
Randy Pausch
Samuele Pedroni
Justin Peel
Marcel van der Peijl
Berker Peksag
Steven Pemberton
+Bo Peng
Santiago Peresón
George Peristerakis
Mathieu Perreault