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

Trivial merge