]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 9 Oct 2014 00:29:32 +0000 (20:29 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 9 Oct 2014 00:29:32 +0000 (20:29 -0400)

Trivial merge