]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 30 Jul 2015 20:44:41 +0000 (16:44 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 30 Jul 2015 20:44:41 +0000 (16:44 -0400)

Trivial merge