]> granicus.if.org Git - python/commitdiff
Issue #22320: merge from 3.4
authorNed Deily <nad@acm.org>
Mon, 1 Sep 2014 07:08:00 +0000 (00:08 -0700)
committerNed Deily <nad@acm.org>
Mon, 1 Sep 2014 07:08:00 +0000 (00:08 -0700)

Trivial merge