]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge with the tip
authorBrian Curtin <brian@python.org>
Sat, 14 Apr 2012 19:20:29 +0000 (14:20 -0500)
committerBrian Curtin <brian@python.org>
Sat, 14 Apr 2012 19:20:29 +0000 (14:20 -0500)

Trivial merge