]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 3 Sep 2014 23:29:31 +0000 (19:29 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 3 Sep 2014 23:29:31 +0000 (19:29 -0400)

Trivial merge