]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorEli Bendersky <eliben@gmail.com>
Tue, 17 Jul 2012 11:22:01 +0000 (14:22 +0300)
committerEli Bendersky <eliben@gmail.com>
Tue, 17 Jul 2012 11:22:01 +0000 (14:22 +0300)

Trivial merge