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

Trivial merge