]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 12 Oct 2015 02:07:48 +0000 (22:07 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 12 Oct 2015 02:07:48 +0000 (22:07 -0400)

Trivial merge