summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-06-28 22:59:52 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-06-28 22:59:52 (GMT)
commitb1c68274cee4e4262f5e5a2fb2786554df138862 (patch)
tree1690ee2edac5231046178707b154c046c261c265 /Misc
parent3fe70b4acc0738041f4617ce76f902e213a51139 (diff)
parent70d2c711f10b385a4bc04b1b827883e12acc0509 (diff)
downloadcpython-b1c68274cee4e4262f5e5a2fb2786554df138862.zip
cpython-b1c68274cee4e4262f5e5a2fb2786554df138862.tar.gz
cpython-b1c68274cee4e4262f5e5a2fb2786554df138862.tar.bz2
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 ae937af..02c04bd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1154,6 +1154,7 @@ John W. Shipman
Joel Shprentz
Itamar Shtull-Trauring
Yue Shuaijie
+Terrel Shumway
Eric Siegerman
Paul Sijben
SilentGhost