| commit | 99e6f87586cd11d0d881891851c831a8d7ebb902 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Apr 23 11:25:49 2012 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Apr 23 11:25:49 2012 -0400 |
| tree | a61afd44e197d24832d38270449bf79f378e82d6 | |
| parent | 7d95e4072169911b228c9e42367afb5f17fd3db0 [diff] | |
| parent | 2cc52efa7c968b6dcf1efcd3cc4f804c447b4814 [diff] |
merge 3.2
diff --git a/Misc/ACKS b/Misc/ACKS index f943594..b2e709a 100644 --- a/Misc/ACKS +++ b/Misc/ACKS
@@ -933,6 +933,7 @@ Denis Severson Ian Seyer Ha Shao +Mark Shannon Richard Shapiro Bruce Sherwood Alexander Shigin