]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 29 Apr 2014 00:04:14 +0000 (02:04 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Tue, 29 Apr 2014 00:04:14 +0000 (02:04 +0200)

Trivial merge