]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 12 Nov 2013 22:09:01 +0000 (23:09 +0100)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 12 Nov 2013 22:09:01 +0000 (23:09 +0100)

Trivial merge