]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 24 Jul 2014 06:59:17 +0000 (02:59 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 24 Jul 2014 06:59:17 +0000 (02:59 -0400)

Trivial merge