]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 20 Oct 2015 06:15:43 +0000 (02:15 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 20 Oct 2015 06:15:43 +0000 (02:15 -0400)

Trivial merge