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

Trivial merge