summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2012-03-12 18:59:48 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2012-03-12 18:59:48 (GMT)
commit17591c1a1d0a6ba20f3b68e2c438d9b9baabc6c9 (patch)
tree3b8f439bfc86f65cc4c79558a1d980c013f05c3a /Misc
parentf28fcff17d9f777eab52126a9c8a984cac17a9ec (diff)
parentf3078fbee2b6555f0f5b1819a231f4b7d8bdf6b5 (diff)
downloadcpython-17591c1a1d0a6ba20f3b68e2c438d9b9baabc6c9.zip
cpython-17591c1a1d0a6ba20f3b68e2c438d9b9baabc6c9.tar.gz
cpython-17591c1a1d0a6ba20f3b68e2c438d9b9baabc6c9.tar.bz2
Head merge.
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 49efa29..a0685c1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -883,6 +883,7 @@ George Sakkis
Rich Salz
Kevin Samborn
Adrian Sampson
+James Sanders
Ilya Sandler
Mark Sapiro
Ty Sarna