]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Thu, 20 Mar 2014 20:44:53 +0000 (21:44 +0100)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Thu, 20 Mar 2014 20:44:53 +0000 (21:44 +0100)

Trivial merge