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

Trivial merge