diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-08-25 23:17:56 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-08-25 23:17:56 (GMT) |
| commit | 8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874 (patch) | |
| tree | b79d348ceebdd5280f206962a0c4e707e1b7c529 /Doc/ACKS.txt | |
| parent | 1329185890e4474d817f3c5d4df1aee70c29d35b (diff) | |
| parent | 77443824f5ca8dea420e678668f55a6c73c27216 (diff) | |
| download | cpython-8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874.zip cpython-8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874.tar.gz cpython-8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874.tar.bz2 | |
Merge from 3.2 (#9302 fix and other changes)
Diffstat (limited to 'Doc/ACKS.txt')
| -rw-r--r-- | Doc/ACKS.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt index bb30e6d..9180cf7 100644 --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -57,6 +57,7 @@ docs@python.org), and we'll be glad to correct the problem. * Carl Feynman * Dan Finnie * Hernán Martínez Foffani + * Michael Foord * Stefan Franke * Jim Fulton * Peter Funk @@ -144,6 +145,7 @@ docs@python.org), and we'll be glad to correct the problem. * Ross Moore * Sjoerd Mullender * Dale Nagata + * Trent Nelson * Michal Nowikowski * Steffen Daode Nurpmeso * Ng Pheng Siong @@ -186,6 +188,7 @@ docs@python.org), and we'll be glad to correct the problem. * Joakim Sernbrant * Justin Sheehy * Charlie Shepherd + * Yue Shuaijie * SilentGhost * Michael Simcich * Ionel Simionescu @@ -230,5 +233,3 @@ docs@python.org), and we'll be glad to correct the problem. * Moshe Zadka * Milan Zamazal * Cheng Zhang - * Trent Nelson - * Michael Foord |