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

[terry.reedy]

https://hg.python.org/cpython/rev/5f9a8a99ed91
changeset:   92936:5f9a8a99ed91
parent:      92934:f7ab0884467e
parent:      92935:50bedeffec2f
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Fri Oct 10 16:53:56 2014 -0400
summary:
  Merge with 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
@@ -409,6 +409,7 @@
 Boris Feld
 Thomas Fenzl
 Niels Ferguson
+Francisco Fernández Castaño
 Sebastian Fernandez
 Florian Festi
 John Feuerstein

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