]> granicus.if.org Git - python/commitdiff
Issue #24079: merge from 3.5
authorNed Deily <nad@acm.org>
Tue, 18 Aug 2015 02:15:54 +0000 (22:15 -0400)
committerNed Deily <nad@acm.org>
Tue, 18 Aug 2015 02:15:54 +0000 (22:15 -0400)

Trivial merge