diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-04-23 11:25:49 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-04-23 11:25:49 -0400 |
| commit | 99e6f87586cd11d0d881891851c831a8d7ebb902 (patch) | |
| tree | a61afd44e197d24832d38270449bf79f378e82d6 | |
| parent | 7d95e4072169911b228c9e42367afb5f17fd3db0 (diff) | |
| parent | 2cc52efa7c968b6dcf1efcd3cc4f804c447b4814 (diff) | |
| download | cpython-git-99e6f87586cd11d0d881891851c831a8d7ebb902.tar.gz | |
merge 3.2
| -rw-r--r-- | Misc/ACKS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -933,6 +933,7 @@ Jerry Seutter Denis Severson Ian Seyer Ha Shao +Mark Shannon Richard Shapiro Bruce Sherwood Alexander Shigin |