]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorEli Bendersky <eliben@gmail.com>
Sun, 3 Jun 2012 05:09:33 +0000 (08:09 +0300)
committerEli Bendersky <eliben@gmail.com>
Sun, 3 Jun 2012 05:09:33 +0000 (08:09 +0300)

Trivial merge