]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 28 May 2012 01:54:28 +0000 (21:54 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 28 May 2012 01:54:28 +0000 (21:54 -0400)

Trivial merge