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

[benjamin.peterson]

http://hg.python.org/cpython/rev/a4672c0f1187
changeset:   90065:a4672c0f1187
branch:      3.4
parent:      90059:bd513e5a5047
parent:      90064:b4cb431badac
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Mar 30 20:34:20 2014 -0400
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
@@ -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