]> granicus.if.org Git - python/commitdiff
Merged upstream change.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Tue, 10 Apr 2012 19:01:35 +0000 (20:01 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Tue, 10 Apr 2012 19:01:35 +0000 (20:01 +0100)

Trivial merge