]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorEli Bendersky <eliben@gmail.com>
Sun, 13 Jan 2013 13:16:36 +0000 (05:16 -0800)
committerEli Bendersky <eliben@gmail.com>
Sun, 13 Jan 2013 13:16:36 +0000 (05:16 -0800)

Trivial merge