]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Wed, 29 Aug 2012 13:27:07 +0000 (14:27 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Wed, 29 Aug 2012 13:27:07 +0000 (14:27 +0100)

Trivial merge