From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 31 Mar 2014 00:34:05 +0000 (-0400)
Subject: merge 3.2
X-Git-Tag: v3.4.1rc1~152^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa2d085d2951a7b5c7c81d30a2fdd333a2fa7145;p=thirdparty%2FPython%2Fcpython.git

merge 3.2
---

aa2d085d2951a7b5c7c81d30a2fdd333a2fa7145
diff --cc Misc/ACKS
index aa1add20b33e,b95047497e1e..2f3a4d15be38
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -91,10 -82,11 +91,11 @@@ Mike Baye
  Samuel L. Bayer
  Donald Beaudry
  David Beazley
 -Robin Becker
  Neal Becker
 +Robin Becker
  Torsten Becker
  Bill Bedford
+ Ian Beer
  Stefan Behnel
  Reimer Behrends
  Ben Bell