summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin Panter <vadmium>2015-09-07 02:10:59 (GMT)
committerMartin Panter <vadmium>2015-09-07 02:10:59 (GMT)
commit06dc2fa3f6fe89d55538031b7b0fa7d988983e0e (patch)
tree1d3f9cfe4d6508b14391da05a573c1c74bce29ee /Misc
parent20a2c6482e28a2ca8d257ba646f2b8ead4837387 (diff)
parent7f02d6d0d946a724ea1f4f1ffb6680c881dbad33 (diff)
downloadcpython-06dc2fa3f6fe89d55538031b7b0fa7d988983e0e.zip
cpython-06dc2fa3f6fe89d55538031b7b0fa7d988983e0e.tar.gz
cpython-06dc2fa3f6fe89d55538031b7b0fa7d988983e0e.tar.bz2
Issue #23406: Merge 3.4 into 3.5
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 2605c3c..240a201 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1127,6 +1127,7 @@ Martin Pool
Iustin Pop
Claudiu Popa
John Popplewell
+Matheus Vieira Portela
Davin Potts
Guillaume Pratte
Florian Preinstorfer