]> granicus.if.org Git - python/commitdiff
Null merge from 3.2.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 31 May 2012 11:38:55 +0000 (12:38 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 31 May 2012 11:38:55 +0000 (12:38 +0100)

Trivial merge