]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 16 Nov 2015 12:32:46 +0000 (07:32 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 16 Nov 2015 12:32:46 +0000 (07:32 -0500)

Trivial merge