]> granicus.if.org Git - python/commitdiff
Block 78699:019a2390b014, this needs to be manually merged.
authorTrent Nelson <trent@trent.me>
Tue, 21 Aug 2012 23:48:55 +0000 (23:48 +0000)
committerTrent Nelson <trent@trent.me>
Tue, 21 Aug 2012 23:48:55 +0000 (23:48 +0000)

Trivial merge