]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 15 Jul 2014 03:07:47 +0000 (23:07 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 15 Jul 2014 03:07:47 +0000 (23:07 -0400)

Trivial merge