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

[benjamin.peterson]

http://hg.python.org/cpython/rev/22cfc057a1f1
changeset:   91355:22cfc057a1f1
parent:      91354:e7fa8518e99a
parent:      91353:fc68113cfb0c
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 23 20:16:06 2014 -0700
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
@@ -415,6 +415,7 @@
 Michael Foord
 Amaury Forgeot d'Arc
 Doug Fort
+Chris Foster
 John Fouhy
 Andrew Francis
 Stefan Franke

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