]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 25 Sep 2015 04:49:31 +0000 (00:49 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 25 Sep 2015 04:49:31 +0000 (00:49 -0400)

Trivial merge