]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.2.
authorRoss Lagerwall <rosslagerwall@gmail.com>
Thu, 22 Dec 2011 07:46:44 +0000 (09:46 +0200)
committerRoss Lagerwall <rosslagerwall@gmail.com>
Thu, 22 Dec 2011 07:46:44 +0000 (09:46 +0200)

Trivial merge