From: Xiang Zhang <angwerzx@126.com>
Date: Tue, 27 Dec 2016 04:30:42 +0000 (+0800)
Subject: Issue #29078: Merge 3.5.
X-Git-Tag: v3.6.1rc1~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8a1aebb3d604924e42653feb536ef7e978ac59a;p=thirdparty%2FPython%2Fcpython.git

Issue #29078: Merge 3.5.
---

b8a1aebb3d604924e42653feb536ef7e978ac59a
diff --cc Misc/ACKS
index 73370ba2ea7b,66c36608af78..553b5278dee4
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1712,3 -1684,5 +1711,4 @@@ Gennadiy Zlobi
  Doug Zongker
  Peter Åstrand
  evilzero
 -Chi Hsuan Yen
+ Dhushyanth Ramasamy