summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-01-02 18:23:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-01-02 18:23:05 (GMT)
commit13a2707f95fe0c56772fffc6d915d857929564a2 (patch)
tree1abf6c1ec9cf23996b13b16075c4e326883ce1d3 /Misc/ACKS
parentcc85a156aea9d5b02ce08f05a9aa543a2be575f9 (diff)
parentc52703720718736082f9bbb15fe35b8e0c5dc551 (diff)
downloadcpython-13a2707f95fe0c56772fffc6d915d857929564a2.zip
cpython-13a2707f95fe0c56772fffc6d915d857929564a2.tar.gz
cpython-13a2707f95fe0c56772fffc6d915d857929564a2.tar.bz2
merge 3.3
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 d6fee11..1f0b1e0 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1207,6 +1207,7 @@ Nathan Trapuzzano
Laurence Tratt
Alberto Trevino
Matthias Troffaes
+Tom Tromey
John Tromp
Jason Trowbridge
Brent Tubbs