summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2014-06-24 20:03:24 (GMT)
committerRaymond Hettinger <python@rcn.com>2014-06-24 20:03:24 (GMT)
commit4c945fe9e9ea813ecb19ed705e1c7b3ae26b0d2a (patch)
tree002c3fff3fa8d85030c2f651fae1df0fc962776a
parent04ba0bb80c6f2b336a031cb0f4ced3fc8297f601 (diff)
parent17f9b64c63b87cb24027bc3751f77a254be00de1 (diff)
downloadcpython-4c945fe9e9ea813ecb19ed705e1c7b3ae26b0d2a.zip
cpython-4c945fe9e9ea813ecb19ed705e1c7b3ae26b0d2a.tar.gz
cpython-4c945fe9e9ea813ecb19ed705e1c7b3ae26b0d2a.tar.bz2
merge
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 6f0ef6b..908f47b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -415,6 +415,7 @@ Arnaud Fontaine
Michael Foord
Amaury Forgeot d'Arc
Doug Fort
+Chris Foster
John Fouhy
Andrew Francis
Stefan Franke