]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Sat, 28 Feb 2015 15:46:00 +0000 (10:46 -0500)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Sat, 28 Feb 2015 15:46:00 +0000 (10:46 -0500)

Trivial merge