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

Trivial merge