]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 16 Jun 2014 07:31:33 +0000 (03:31 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 16 Jun 2014 07:31:33 +0000 (03:31 -0400)

Trivial merge