]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Aug 2014 03:33:32 +0000 (23:33 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 9 Aug 2014 03:33:32 +0000 (23:33 -0400)

Trivial merge