]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Aug 2015 03:37:31 +0000 (23:37 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Aug 2015 03:37:31 +0000 (23:37 -0400)

Trivial merge