]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Fri, 22 Jun 2012 20:09:42 +0000 (16:09 -0400)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Fri, 22 Jun 2012 20:09:42 +0000 (16:09 -0400)

Trivial merge