summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-07-20 18:22:27 (GMT)
committerBrett Cannon <brett@python.org>2012-07-20 18:22:27 (GMT)
commit4afc1c08d04a9c083b654178ea4f947563510836 (patch)
tree396950df23a20550d2cd0b10470ed86485e727a9 /Misc
parent6ee96952703ebfde9bdfa5852fa4ddfe8363442e (diff)
parentb17ad53e3933e873529e9a02ffe4e061dd90ef3d (diff)
downloadcpython-4afc1c08d04a9c083b654178ea4f947563510836.zip
cpython-4afc1c08d04a9c083b654178ea4f947563510836.tar.gz
cpython-4afc1c08d04a9c083b654178ea4f947563510836.tar.bz2
Merge
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 d085063..fc08cad 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -866,6 +866,7 @@ Bernhard Reiter
Steven Reiz
Roeland Rengelink
Antoine Reversat
+Flávio Ribeiro
Francesco Ricciardi
Tim Rice
Jan Pieter Riegel