]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 13 Jul 2014 21:27:41 +0000 (17:27 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 13 Jul 2014 21:27:41 +0000 (17:27 -0400)

Trivial merge