summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-10-23 10:39:01 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-10-23 10:39:01 (GMT)
commitde6e800f45b292c6290359ddbe9f079de3e08663 (patch)
tree85efec3d89fe750f45fc166142a7aadbaaa20ffa /Misc
parent4575beba4b493fcae5e4eb308a31926da0ce24d1 (diff)
parent0e316f688ef2499fe31ea7cf8e4884cf22863b0d (diff)
downloadcpython-de6e800f45b292c6290359ddbe9f079de3e08663.zip
cpython-de6e800f45b292c6290359ddbe9f079de3e08663.tar.gz
cpython-de6e800f45b292c6290359ddbe9f079de3e08663.tar.bz2
Merge 3.4 (Issue #25461)
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 120956e..b6089fd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1244,6 +1244,7 @@ Rusty Russell
Nick Russo
James Rutherford
Chris Ryland
+Bernt Røskar Brenna
Constantina S.
Patrick Sabin
Sébastien Sablé