summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2013-11-23 01:18:26 (GMT)
committerAndrew Kuchling <amk@amk.ca>2013-11-23 01:18:26 (GMT)
commitfd66cc5534ffb8fbdd071b2c453744562a16e818 (patch)
treee6e8c41367e23df02fa2867605eb9523eef73208 /Misc
parent9c1aed8f94a2b7a40c3a4db60cb289c90e001896 (diff)
parentf92ef9be46ad7a1ca7fc177074892e6486e8b35f (diff)
downloadcpython-fd66cc5534ffb8fbdd071b2c453744562a16e818.zip
cpython-fd66cc5534ffb8fbdd071b2c453744562a16e818.tar.gz
cpython-fd66cc5534ffb8fbdd071b2c453744562a16e818.tar.bz2
Merge from 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 8c89f16..9436af8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1186,7 +1186,6 @@ Pete Shinners
Michael Shiplett
John W. Shipman
Joel Shprentz
-Itamar Shtull-Trauring
Yue Shuaijie
Terrel Shumway
Eric Siegerman
@@ -1316,6 +1315,7 @@ Anthony Tuininga
Erno Tukia
David Turner
Stephen Turner
+Itamar Turner-Trauring
Theodore Turocy
Bill Tutt
Fraser Tweedale