]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 9 Apr 2013 15:23:27 +0000 (17:23 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 9 Apr 2013 15:23:27 +0000 (17:23 +0200)

Trivial merge