summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-09-05 14:15:32 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-09-05 14:15:32 (GMT)
commit6a8c8a80a1c47595652a267665bdbae2bd8489f0 (patch)
tree7def15cc73cc0f135a337b186088dca4d7dcfd28 /Misc/ACKS
parent2c2d2aedd5c48a5fbbbb4a238b7d4e86a5f64b60 (diff)
parentd9e0b068af175a2fc1c2fe979ab97b5d4f8239b7 (diff)
downloadcpython-6a8c8a80a1c47595652a267665bdbae2bd8489f0.zip
cpython-6a8c8a80a1c47595652a267665bdbae2bd8489f0.tar.gz
cpython-6a8c8a80a1c47595652a267665bdbae2bd8489f0.tar.bz2
#12888: merge with 3.2.
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 dd9e9f6..fa70c72 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -704,6 +704,7 @@ Douglas Orr
Michele OrrĂ¹
Oleg Oshmyan
Denis S. Otkidach
+Peter Otten
Michael Otteneder
R. M. Oudkerk
Russel Owen