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

Trivial merge