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

[benjamin.peterson]

http://hg.python.org/cpython/rev/8017e8df6a30
changeset:   90066:8017e8df6a30
parent:      90060:cb66598b0bfb
parent:      90065:a4672c0f1187
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 30 20:34:30 2014 -0400
summary:
  merge 3.4

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
@@ -96,6 +96,7 @@
 Robin Becker
 Torsten Becker
 Bill Bedford
+Ian Beer
 Stefan Behnel
 Reimer Behrends
 Ben Bell

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