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

Trivial merge