]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 3 Aug 2015 22:43:50 +0000 (18:43 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 3 Aug 2015 22:43:50 +0000 (18:43 -0400)

Trivial merge