]> granicus.if.org Git - python/commitdiff
Merge.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 7 May 2011 12:44:50 +0000 (13:44 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Sat, 7 May 2011 12:44:50 +0000 (13:44 +0100)

Trivial merge