]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 13 Jun 2014 18:23:57 +0000 (14:23 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 13 Jun 2014 18:23:57 +0000 (14:23 -0400)

Trivial merge