]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Sat, 21 Jun 2014 11:59:25 +0000 (13:59 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Sat, 21 Jun 2014 11:59:25 +0000 (13:59 +0200)

Trivial merge