summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-19 20:52:25 -0500
committerBenjamin Peterson <benjamin@python.org>2014-03-19 20:52:25 -0500
commite5280feba1db956bd984b9a13a6a5453ec618948 (patch)
tree756c80a473574c183bd2493d44e20b8dd83f304d
parentc51da2b8a098e8e84e843602e8a3f6c4d3e07ec7 (diff)
parentdeec16be07063a346650436f30d7aeb47516382b (diff)
downloadcpython-git-e5280feba1db956bd984b9a13a6a5453ec618948.tar.gz
merge 3.4
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index b8aaf75331..8875389213 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -574,6 +574,7 @@ Michael Hudson
Jim Hugunin
Greg Humphreys
Eric Huss
+Nehal Hussain
Taihyun Hwang
Jeremy Hylton
Ludwig Hähne