]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sun, 11 Sep 2016 11:53:34 +0000 (12:53 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sun, 11 Sep 2016 11:53:34 +0000 (12:53 +0100)

Trivial merge