]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 10 Jun 2014 06:49:54 +0000 (02:49 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 10 Jun 2014 06:49:54 +0000 (02:49 -0400)

Trivial merge