]> granicus.if.org Git - python/commitdiff
Issue #24330: merge from 3.4
authorNed Deily <nad@acm.org>
Sat, 4 Jul 2015 22:06:21 +0000 (15:06 -0700)
committerNed Deily <nad@acm.org>
Sat, 4 Jul 2015 22:06:21 +0000 (15:06 -0700)

Trivial merge