]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Mon, 2 May 2011 16:31:17 +0000 (12:31 -0400)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Mon, 2 May 2011 16:31:17 +0000 (12:31 -0400)

Trivial merge