]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 15 May 2012 20:21:01 +0000 (22:21 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 15 May 2012 20:21:01 +0000 (22:21 +0200)

Trivial merge