]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorGiampaolo Rodola' <g.rodola@gmail.com>
Fri, 26 Apr 2013 13:24:42 +0000 (15:24 +0200)
committerGiampaolo Rodola' <g.rodola@gmail.com>
Fri, 26 Apr 2013 13:24:42 +0000 (15:24 +0200)

Trivial merge