summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-10-10 20:53:56 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-10-10 20:53:56 (GMT)
commit439da843e47b4d5b4fd1742845a7c4ba1c2b8c76 (patch)
treeaa30e60c8e5590debd2d951711930b1b11079097 /Misc
parent1eb32c20459b87ac42d6aba5d9eade8f9d129893 (diff)
parent64138c438cb095b52107d856deebbe90d799bc07 (diff)
downloadcpython-439da843e47b4d5b4fd1742845a7c4ba1c2b8c76.zip
cpython-439da843e47b4d5b4fd1742845a7c4ba1c2b8c76.tar.gz
cpython-439da843e47b4d5b4fd1742845a7c4ba1c2b8c76.tar.bz2
Merge with 3.4
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 417ada7..2e08533 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -409,6 +409,7 @@ Mark Favas
Boris Feld
Thomas Fenzl
Niels Ferguson
+Francisco Fernández Castaño
Sebastian Fernandez
Florian Festi
John Feuerstein