From: Martin Panter <vadmium>
Date: Mon, 7 Sep 2015 04:04:40 +0000 (+0000)
Subject: Issue #25004: Merge 3.4 into 3.5
X-Git-Tag: v3.6.0a1~1651^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da19767b86dcee5810ad8c77a05811be041d7c89;p=python

Issue #25004: Merge 3.4 into 3.5
---

da19767b86dcee5810ad8c77a05811be041d7c89
diff --cc Misc/ACKS
index 240a201985,88e55e022f..e1afc728bf
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -103,7 -100,7 +103,8 @@@ Mike Baye
  Samuel L. Bayer
  Donald Beaudry
  David Beazley
+ John Beck
 +Ingolf Becker
  Neal Becker
  Robin Becker
  Torsten Becker