merge 3.2

author Benjamin Peterson <benjamin@python.org>

Mon, 31 Mar 2014 00:34:05 +0000 (20:34 -0400)

committer Benjamin Peterson <benjamin@python.org>

Mon, 31 Mar 2014 00:34:05 +0000 (20:34 -0400)
author Benjamin Peterson <benjamin@python.org>
Mon, 31 Mar 2014 00:34:05 +0000 (20:34 -0400)
committer Benjamin Peterson <benjamin@python.org>
Mon, 31 Mar 2014 00:34:05 +0000 (20:34 -0400)
diff --cc Misc/ACKS

index aa1add20b33e71e76ae8904fa45dedfd0973cbf1,b95047497e1e2d5d7647254c7dfb31dbc54c4e20..2f3a4d15be38ff8c19b6804309b2bd716093a332
--- 1/Misc/ACKS
--- 2/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
author	Benjamin Peterson <benjamin@python.org>
	Mon, 31 Mar 2014 00:34:05 +0000 (20:34 -0400)
committer	Benjamin Peterson <benjamin@python.org>
	Mon, 31 Mar 2014 00:34:05 +0000 (20:34 -0400)