From: Petri Lehtinen <petri@digip.org>
Date: Sun, 12 Feb 2012 19:06:57 +0000 (+0200)
Subject: Merge branch '3.2'
X-Git-Tag: v3.3.0a1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7551a16c7211301c51d15084894e0fed49fe086;p=python

Merge branch '3.2'

Closes #9750
---

c7551a16c7211301c51d15084894e0fed49fe086
diff --cc Misc/ACKS
index b38673b986,f79ecedd08..a0f6f25545
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -543,9 -503,7 +543,10 @@@ Lenny Knele
  Pat Knight
  Greg Kochanski
  Damon Kohler
+ Marko Kohtala
 +Jacek Konieczny
 +Марк Коренберг
 +Arkady Koplyarov
  Vlad Korolev
  Joseph Koshy
  Maksim Kozyarchuk