]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge from 3.2 (#9302 fix and other changes)
authorÉric Araujo <merwok@netwok.org>
Thu, 25 Aug 2011 23:17:56 +0000 (01:17 +0200)
committerÉric Araujo <merwok@netwok.org>
Thu, 25 Aug 2011 23:17:56 +0000 (01:17 +0200)
1  2 
Doc/ACKS.txt

diff --cc Doc/ACKS.txt
Simple merge