]> granicus.if.org Git - python/commitdiff
Issue #24381: merge from 3.5
authorNed Deily <nad@python.org>
Thu, 20 Oct 2016 19:40:22 +0000 (15:40 -0400)
committerNed Deily <nad@python.org>
Thu, 20 Oct 2016 19:40:22 +0000 (15:40 -0400)

Trivial merge