]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 2 May 2011 12:18:21 +0000 (13:18 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 2 May 2011 12:18:21 +0000 (13:18 +0100)

Trivial merge