]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 26 May 2012 19:39:27 +0000 (20:39 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 26 May 2012 19:39:27 +0000 (20:39 +0100)

Trivial merge