]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 5 Mar 2012 09:44:25 +0000 (09:44 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 5 Mar 2012 09:44:25 +0000 (09:44 +0000)

Trivial merge