]> granicus.if.org Git - python/commitdiff
Issue #24357: merge from 3.5
authorNed Deily <nad@acm.org>
Tue, 2 Jun 2015 04:21:13 +0000 (21:21 -0700)
committerNed Deily <nad@acm.org>
Tue, 2 Jun 2015 04:21:13 +0000 (21:21 -0700)

Trivial merge