]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorNed Deily <nad@acm.org>
Sun, 5 Aug 2012 22:16:04 +0000 (15:16 -0700)
committerNed Deily <nad@acm.org>
Sun, 5 Aug 2012 22:16:04 +0000 (15:16 -0700)

Trivial merge