]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 27 Jan 2014 01:10:56 +0000 (20:10 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 27 Jan 2014 01:10:56 +0000 (20:10 -0500)

Trivial merge