]> granicus.if.org Git - python/commitdiff
Merged upstream changes.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 23 Mar 2013 11:01:36 +0000 (11:01 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 23 Mar 2013 11:01:36 +0000 (11:01 +0000)

Trivial merge