]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Sun, 1 Jun 2014 04:30:55 +0000 (00:30 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sun, 1 Jun 2014 04:30:55 +0000 (00:30 -0400)

Trivial merge