summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-06-03 08:16:39 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-06-03 08:16:39 (GMT)
commitfe4dfd2b65850f0cddec700e2f747fec611b4be9 (patch)
tree37acd3c73a0a549f35235bb145c8a60a928b3071 /Misc
parent1251fafcc57091d952bb1cc9b1e1a77f39c59b7b (diff)
parent2168b31cac93aa36273dc5974db5fb446a6679eb (diff)
downloadcpython-fe4dfd2b65850f0cddec700e2f747fec611b4be9.zip
cpython-fe4dfd2b65850f0cddec700e2f747fec611b4be9.tar.gz
cpython-fe4dfd2b65850f0cddec700e2f747fec611b4be9.tar.bz2
merge heads
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 0fbaa44..9c2483c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -989,6 +989,7 @@ Frank Stajano
Joel Stanley
Oliver Steele
Greg Stein
+Baruch Sterin
Chris Stern
Alex Stewart
Victor Stinner