]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 12 Nov 2015 20:24:50 +0000 (15:24 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 12 Nov 2015 20:24:50 +0000 (15:24 -0500)

Trivial merge