]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Aug 2015 17:02:27 +0000 (13:02 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 27 Aug 2015 17:02:27 +0000 (13:02 -0400)

Trivial merge