]> granicus.if.org Git - python/commitdiff
Merge with 3.4
authorTerry Jan Reedy <tjreedy@udel.edu>
Tue, 19 Aug 2014 23:47:51 +0000 (19:47 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Tue, 19 Aug 2014 23:47:51 +0000 (19:47 -0400)

Trivial merge