From: Łukasz Langa <lukasz@langa.pl>
Date: Sun, 12 Jun 2016 01:05:42 +0000 (-0700)
Subject: Merge 3.5, issue #14209
X-Git-Tag: v3.6.0a2~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34ad2ef8f9a2fb506389b8c6b490f2ef19b5ff40;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5, issue #14209
---

34ad2ef8f9a2fb506389b8c6b490f2ef19b5ff40
diff --cc Misc/ACKS
index 860eeb33aaa7,632c85ccdd28..b62bd51be1de
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1145,8 -1136,8 +1145,9 @@@ Ronny Pfannschmid
  Geoff Philbrick
  Gavrie Philipson
  Adrian Phillips
 +Dusty Phillips
  Christopher J. Phoenix
+ James Pickering
  Neale Pickett
  Jim St. Pierre
  Dan Pierson