summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-02-27 16:47:40 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-02-27 16:47:40 (GMT)
commit69899e6f3f92cf10de2164b1d46c0f4355f9d26d (patch)
tree05b61eb1492c9d225466772d6d8779927ab895e2 /Misc/ACKS
parentad9296e4037c4ff94c6bba83637759f8f40ee31b (diff)
parentb389b482659a0633d84f15307c9605cc0bf28633 (diff)
downloadcpython-69899e6f3f92cf10de2164b1d46c0f4355f9d26d.zip
cpython-69899e6f3f92cf10de2164b1d46c0f4355f9d26d.tar.gz
cpython-69899e6f3f92cf10de2164b1d46c0f4355f9d26d.tar.bz2
Merge 3.4 (httplib)
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 f66baa3..861216e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1270,6 +1270,7 @@ Alexander Shigin
Pete Shinners
Michael Shiplett
John W. Shipman
+Alex Shkop
Joel Shprentz
Yue Shuaijie
Terrel Shumway