diff COPYRIGHT @ 29436:89858e3a0464

merge of '2aa174ad4c0e50a229c8c951b836b5f788fe7393' and '633db1f2c83f666e4ac7a26601725cb01233681e'
author Mark Doliner <mark@kingant.net>
date Sun, 14 Feb 2010 20:20:00 +0000
parents bafc2a8bb747
children 185677f47825
line wrap: on
line diff