From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 4 Apr 2013 06:16:42 +0000 (+0300)
Subject: #8913: merge with 3.3.
X-Git-Tag: v3.4.0a1~1030
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9e2147deefc8f9950fbb161e36a95add8c79658;p=python

#8913: merge with 3.3.
---

b9e2147deefc8f9950fbb161e36a95add8c79658
diff --cc Misc/ACKS
index 9af88330d4,03310ed3bc..3686b6a573
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -922,9 -907,9 +922,10 @@@ Peter Parent
  Alexandre Parenteau
  Dan Parisien
  William Park
+ Heikki Partanen
  Harri Pasanen
  Gaël Pasgrimaud
 +Ashish Nitin Patil
  Randy Pausch
  Samuele Pedroni
  Justin Peel