]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 31 Jul 2015 01:16:29 +0000 (21:16 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 31 Jul 2015 01:16:29 +0000 (21:16 -0400)

Trivial merge