]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Sun, 22 Jun 2014 10:44:05 +0000 (12:44 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Sun, 22 Jun 2014 10:44:05 +0000 (12:44 +0200)

Trivial merge