]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 27 Oct 2015 07:38:18 +0000 (03:38 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 27 Oct 2015 07:38:18 +0000 (03:38 -0400)

Trivial merge