]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #18026: merge
authorNed Deily <nad@acm.org>
Mon, 20 May 2013 21:32:06 +0000 (14:32 -0700)
committerNed Deily <nad@acm.org>
Mon, 20 May 2013 21:32:06 +0000 (14:32 -0700)

Trivial merge