]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Sat, 7 May 2011 15:08:04 +0000 (17:08 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Sat, 7 May 2011 15:08:04 +0000 (17:08 +0200)

Trivial merge