From: Brian Curtin <brian@python.org>
Date: Thu, 16 May 2013 17:03:40 +0000 (-0500)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~719
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e914123d1f07159f32bf4330556397ce4d590189;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.3
---

e914123d1f07159f32bf4330556397ce4d590189
diff --cc Misc/ACKS
index 6d08530fbe03,b47accffaa10..6adb14a145cd
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -1161,7 -1137,7 +1161,8 @@@ George Sip
  J. Sipprell
  Kragen Sitaker
  Michael Sloan
+ Nick Sloan
 +Václav Šmilauer
  Christopher Smith
  Eric V. Smith
  Gregory P. Smith