]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 15 Aug 2014 01:55:01 +0000 (21:55 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 15 Aug 2014 01:55:01 +0000 (21:55 -0400)

Trivial merge