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

Trivial merge