]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads in 3.2 branch
authorEli Bendersky <eliben@gmail.com>
Wed, 15 Aug 2012 11:50:52 +0000 (14:50 +0300)
committerEli Bendersky <eliben@gmail.com>
Wed, 15 Aug 2012 11:50:52 +0000 (14:50 +0300)

Trivial merge