From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Jun 2011 17:30:16 +0000 (-0500)
Subject: merge 3.2 (#12009)
X-Git-Tag: v3.3.0a1~2136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae10b3201cbed5fb181757f2ef80f9cd7c1fff45;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#12009)
---

ae10b3201cbed5fb181757f2ef80f9cd7c1fff45
diff --cc Misc/ACKS
index 900fae705ac1,d578c483f136..3cf269bab298
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -641,9 -607,9 +641,10 @@@ Skip Montanar
  Paul Moore
  Derek Morr
  James A Morrison
 +Derek McTavish Mounce
  Pablo Mouzo
  Mher Movsisyan
+ Ruslan Mstoi
  Sjoerd Mullender
  Sape Mullender
  Michael Muller