]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Wed, 2 Jul 2014 01:33:46 +0000 (21:33 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Wed, 2 Jul 2014 01:33:46 +0000 (21:33 -0400)

Trivial merge