]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 21 Sep 2015 05:44:20 +0000 (01:44 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 21 Sep 2015 05:44:20 +0000 (01:44 -0400)

Trivial merge