]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 20 Jul 2015 21:45:22 +0000 (17:45 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 20 Jul 2015 21:45:22 +0000 (17:45 -0400)

Trivial merge