]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 6 Jun 2014 21:43:37 +0000 (17:43 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 6 Jun 2014 21:43:37 +0000 (17:43 -0400)

Trivial merge