]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 20 May 2014 02:54:58 +0000 (22:54 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 20 May 2014 02:54:58 +0000 (22:54 -0400)

Trivial merge