]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 12 Jul 2013 20:18:49 +0000 (21:18 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 12 Jul 2013 20:18:49 +0000 (21:18 +0100)

Trivial merge