]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Thu, 20 Sep 2012 20:49:58 +0000 (16:49 -0400)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Thu, 20 Sep 2012 20:49:58 +0000 (16:49 -0400)

Trivial merge