[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/fbdaca8bf3f5
changeset:   89607:fbdaca8bf3f5
parent:      89604:8a77e22aff6c
parent:      89605:e682f87a6822
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 12 15:09:00 2014 -0500
summary:
  merge 3.3

files:
  Misc/ACKS |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1098,6 +1098,7 @@
 Jim Robinson
 Mark Roddy
 Kevin Rodgers
+Sean Rodman
 Giampaolo Rodola
 Elson Rodriguez
 Adi Roiban

-- 
Repository URL: http://hg.python.org/cpython