]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #18604: merge from 3.4
authorNed Deily <nad@acm.org>
Sun, 4 May 2014 02:25:34 +0000 (19:25 -0700)
committerNed Deily <nad@acm.org>
Sun, 4 May 2014 02:25:34 +0000 (19:25 -0700)

Trivial merge