merge with 3.3

author Georg Brandl <georg@python.org>

Sun, 6 Oct 2013 19:23:26 +0000 (21:23 +0200)

committer Georg Brandl <georg@python.org>

Sun, 6 Oct 2013 19:23:26 +0000 (21:23 +0200)
author Georg Brandl <georg@python.org>
Sun, 6 Oct 2013 19:23:26 +0000 (21:23 +0200)
committer Georg Brandl <georg@python.org>
Sun, 6 Oct 2013 19:23:26 +0000 (21:23 +0200)
diff --cc Misc/ACKS

index 1e06e49a3ecc67c923901a3a3308dc1755964000,0a49abf227cce8d94691fb23a85a8385b9ba78ac..1d34956d138a11bb230d8debe2bfcf57bcef32a8
--- 1/Misc/ACKS
--- 2/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
author	Georg Brandl <georg@python.org>
	Sun, 6 Oct 2013 19:23:26 +0000 (21:23 +0200)
committer	Georg Brandl <georg@python.org>
	Sun, 6 Oct 2013 19:23:26 +0000 (21:23 +0200)