]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sun, 28 Oct 2012 12:41:44 +0000 (12:41 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sun, 28 Oct 2012 12:41:44 +0000 (12:41 +0000)

Trivial merge