]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads
authorKurt B. Kaiser <kbk@shore.net>
Sat, 14 May 2011 21:30:58 +0000 (17:30 -0400)
committerKurt B. Kaiser <kbk@shore.net>
Sat, 14 May 2011 21:30:58 +0000 (17:30 -0400)

Trivial merge