From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 19 Jan 2014 02:51:11 +0000 (-0500)
Subject: merge 3.3 (#18574)
X-Git-Tag: v3.4.0b3~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c28ab08887ae1de3a759d77a227f4a2c8d9c918f;p=thirdparty%2FPython%2Fcpython.git

merge 3.3 (#18574)
---

c28ab08887ae1de3a759d77a227f4a2c8d9c918f
diff --cc Misc/ACKS
index e2f990e68ba6,6dfbd4939482..76cc888c424c
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1050,8 -1003,8 +1050,9 @@@ Jérôme Radi
  Burton Radons
  Jeff Ramnani
  Brodie Rao
 +Senko Rasic
  Antti Rasinen
+ Nikolaus Rath
  Sridhar Ratnakumar
  Ysj Ray
  Eric S. Raymond