]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 30 Oct 2015 23:25:50 +0000 (19:25 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 30 Oct 2015 23:25:50 +0000 (19:25 -0400)

Trivial merge