From: Brett Cannon <brett@python.org>
Date: Sun, 23 Dec 2012 00:38:32 +0000 (-0500)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a1~1799
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da;p=thirdparty%2FPython%2Fcpython.git

merge with 3.3
---

2909d6b47c5a96b38099d5e00fd68e6b5c3ef4da
diff --cc Misc/ACKS
index aa95d4dfb36d,e4d178355af7..90894a002052
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -900,10 -894,6 +900,7 @@@ Dan Parisie
  William Park
  Harri Pasanen
  Gaël Pasgrimaud
 +Ashish Nitin Patil
- Berker Peksag
- Bo Peng
- Joe Peterson
  Randy Pausch
  Samuele Pedroni
  Justin Peel