]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorEli Bendersky <eliben@gmail.com>
Thu, 24 Jan 2013 15:17:05 +0000 (07:17 -0800)
committerEli Bendersky <eliben@gmail.com>
Thu, 24 Jan 2013 15:17:05 +0000 (07:17 -0800)

Trivial merge