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

Trivial merge