]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Fri, 4 May 2012 20:16:09 +0000 (22:16 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Fri, 4 May 2012 20:16:09 +0000 (22:16 +0200)

Trivial merge