]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 23 Nov 2012 19:22:39 +0000 (19:22 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 23 Nov 2012 19:22:39 +0000 (19:22 +0000)

Trivial merge