summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-02-17 00:45:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-02-17 00:45:42 (GMT)
commit77c041ba64f87ac021c2a7a9314d9a3a1145057f (patch)
treee0f19e9fa4974fe541862907eae85fe1c3b5ba0a /Misc/ACKS
parent43036a66c37075534febdc4a4caaae8a364a9942 (diff)
parent54237f9feaefd209c2aaa5b4003810e69f6714f3 (diff)
downloadcpython-77c041ba64f87ac021c2a7a9314d9a3a1145057f.zip
cpython-77c041ba64f87ac021c2a7a9314d9a3a1145057f.tar.gz
cpython-77c041ba64f87ac021c2a7a9314d9a3a1145057f.tar.bz2
merge 3.4 (#21548)
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 c1d0dab..f66baa3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -513,6 +513,7 @@ Eric Groo
Dag Gruneau
Filip Gruszczyński
Thomas Guettler
+Yuyang Guo
Anuj Gupta
Michael Guravage
Lars Gustäbel