summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-06-11 17:56:09 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-06-11 17:56:09 (GMT)
commitbc18532eee4098bd57805d021b53fba618428d15 (patch)
treeca6b5563bada0b00521f48aa2f0ebd20a2ad7491 /Misc/ACKS
parenta52930834823502254839af17cc5d972d7f82856 (diff)
parent6280606a5781147158a607b409ec7ebf4732bd92 (diff)
downloadcpython-bc18532eee4098bd57805d021b53fba618428d15.zip
cpython-bc18532eee4098bd57805d021b53fba618428d15.tar.gz
cpython-bc18532eee4098bd57805d021b53fba618428d15.tar.bz2
Branch merge
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 8b3055c..163d9b8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -116,6 +116,7 @@ Monty Brandenberg
Georg Brandl
Christopher Brannon
Terrence Brannon
+Erik Bray
Brian Brazil
Dave Brennan
Tom Bridgman