summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorŁukasz Langa <lukasz@langa.pl>2015-04-14 07:15:42 (GMT)
committerŁukasz Langa <lukasz@langa.pl>2015-04-14 07:15:42 (GMT)
commite91ecb2b3416701c22ac849d570683097ad01d60 (patch)
tree7ad674eb492e862d083df50f666acbed725b9927 /Misc/ACKS
parentdfa4e045a363fd1dd31c1d57002fc78c10de85a2 (diff)
parent5f6684efe0690c1272b206764301e751e37d9bcf (diff)
downloadcpython-e91ecb2b3416701c22ac849d570683097ad01d60.zip
cpython-e91ecb2b3416701c22ac849d570683097ad01d60.tar.gz
cpython-e91ecb2b3416701c22ac849d570683097ad01d60.tar.bz2
Merge 3.4 (#23310)
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2a5236e..75a34d4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -642,6 +642,7 @@ John Interrante
Bob Ippolito
Roger Irwin
Atsuo Ishimoto
+Kasia Jachim
Adam Jackson
Ben Jackson
Paul Jackson
@@ -849,7 +850,6 @@ Hugo Lopes Tavares
Anne Lord
Tom Loredo
Justin Love
-Kasia Jachim
Ned Jackson Lovely
Chalmer Lowe
Jason Lowe