]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 20 Sep 2015 23:57:37 +0000 (19:57 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 20 Sep 2015 23:57:37 +0000 (19:57 -0400)

Trivial merge