From: Georg Brandl <georg@python.org>
Date: Sun, 6 Oct 2013 19:23:26 +0000 (+0200)
Subject: merge with 3.3
X-Git-Tag: v3.4.0a4~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c679514a506c485240e917c52e49a59e02bd122;p=python

merge with 3.3
---

7c679514a506c485240e917c52e49a59e02bd122
diff --cc Misc/ACKS
index 1e06e49a3e,0a49abf227..1d34956d13
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1007,10 -972,9 +1007,11 @@@ Antoine Pitro
  Jean-François Piéronne
  Oleg Plakhotnyuk
  Remi Pointel
 +Ariel Poliak
  Guilherme Polo
 +Illia Polosukhin
  Michael Pomraning
+ Martin Pool
  Iustin Pop
  Claudiu Popa
  John Popplewell