]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 14 Aug 2015 20:59:58 +0000 (16:59 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 14 Aug 2015 20:59:58 +0000 (16:59 -0400)

Trivial merge