]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 22 Sep 2015 02:42:43 +0000 (22:42 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 22 Sep 2015 02:42:43 +0000 (22:42 -0400)

Trivial merge