]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Thu, 12 Jan 2012 07:09:15 +0000 (08:09 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Thu, 12 Jan 2012 07:09:15 +0000 (08:09 +0100)

Trivial merge