]> granicus.if.org Git - python/commitdiff
Merge from 3.4 after patch separately committed as 697adefaba6b.
authorTerry Jan Reedy <tjreedy@udel.edu>
Fri, 5 Dec 2014 04:29:07 +0000 (23:29 -0500)
committerTerry Jan Reedy <tjreedy@udel.edu>
Fri, 5 Dec 2014 04:29:07 +0000 (23:29 -0500)

Trivial merge