]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 18 Oct 2014 21:10:32 +0000 (17:10 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 18 Oct 2014 21:10:32 +0000 (17:10 -0400)

Trivial merge