]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 21 Nov 2015 00:37:00 +0000 (19:37 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 21 Nov 2015 00:37:00 +0000 (19:37 -0500)

Trivial merge