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

Trivial merge