]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Tue, 29 May 2012 11:53:00 +0000 (12:53 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Tue, 29 May 2012 11:53:00 +0000 (12:53 +0100)

Trivial merge