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

Trivial merge