]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 30 May 2014 18:05:02 +0000 (19:05 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 30 May 2014 18:05:02 +0000 (19:05 +0100)

Trivial merge