]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Sep 2015 07:52:36 +0000 (03:52 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 23 Sep 2015 07:52:36 +0000 (03:52 -0400)

Trivial merge