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

[raymond.hettinger]

http://hg.python.org/cpython/rev/a941bb617c2a
changeset:   91357:a941bb617c2a
branch:      3.4
parent:      91356:8e5e04a1497f
parent:      91353:fc68113cfb0c
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Jun 24 13:03:24 2014 -0700
summary:
  merge

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