]> granicus.if.org Git - python/commitdiff
Merge upstream change.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 3 Sep 2016 15:55:35 +0000 (16:55 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 3 Sep 2016 15:55:35 +0000 (16:55 +0100)

Trivial merge