summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-01-21 07:58:44 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-01-21 07:58:44 (GMT)
commit875dde4387e0877ae3603875fbd4ef3532a1e5ce (patch)
treed0be259e0744de0a9857a327de6e9b673c08a532 /Misc
parent2b0b5ac5a0935dd0deb30c129fc117640d409ac6 (diff)
parentd99cd333fedbac4dfdd40b4a15f16e50c82bb9da (diff)
downloadcpython-875dde4387e0877ae3603875fbd4ef3532a1e5ce.zip
cpython-875dde4387e0877ae3603875fbd4ef3532a1e5ce.tar.gz
cpython-875dde4387e0877ae3603875fbd4ef3532a1e5ce.tar.bz2
Merge 3.5 (doc)
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 ebc0d5d..eec104f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1073,6 +1073,7 @@ Russel Owen
Joonas Paalasmaa
Martin Packman
Shriphani Palakodety
+Julien Palard
Ondrej Palkovsky
Mike Pall
Todd R. Palmer