]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 19 May 2012 15:52:33 +0000 (16:52 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 19 May 2012 15:52:33 +0000 (16:52 +0100)

Trivial merge