]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 4 Dec 2014 05:55:16 +0000 (00:55 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 4 Dec 2014 05:55:16 +0000 (00:55 -0500)

Trivial merge