]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sun, 24 Jun 2012 10:24:05 +0000 (11:24 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sun, 24 Jun 2012 10:24:05 +0000 (11:24 +0100)

Trivial merge