]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorAntoine Pitrou <solipsis@pitrou.net>
Mon, 1 Oct 2012 21:44:19 +0000 (23:44 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Mon, 1 Oct 2012 21:44:19 +0000 (23:44 +0200)

Trivial merge