]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 14 Oct 2014 20:56:57 +0000 (16:56 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 14 Oct 2014 20:56:57 +0000 (16:56 -0400)

Trivial merge