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

Trivial merge