]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 7 Sep 2015 05:58:29 +0000 (01:58 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 7 Sep 2015 05:58:29 +0000 (01:58 -0400)

Trivial merge