]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Wed, 16 May 2012 14:03:07 +0000 (16:03 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Wed, 16 May 2012 14:03:07 +0000 (16:03 +0200)

Trivial merge