]> granicus.if.org Git - python/commitdiff
Merge with 3.4 #22614
authorTerry Jan Reedy <tjreedy@udel.edu>
Mon, 13 Oct 2014 02:59:18 +0000 (22:59 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Mon, 13 Oct 2014 02:59:18 +0000 (22:59 -0400)

Trivial merge