]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Thu, 12 Jun 2014 05:03:35 +0000 (01:03 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Thu, 12 Jun 2014 05:03:35 +0000 (01:03 -0400)

Trivial merge