]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Sun, 4 Aug 2013 18:52:42 +0000 (14:52 -0400)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Sun, 4 Aug 2013 18:52:42 +0000 (14:52 -0400)

Trivial merge