diff COPYRIGHT @ 28879:bb923bcae9de

merge of '661db628ce40c3548058f062ea72d9687654d53a' and '8a71ac6c6bfac72c7077754c4d8178b77f14b18f'
author Mark Doliner <mark@kingant.net>
date Wed, 04 Nov 2009 22:16:51 +0000
parents 8464e695c62b
children 69aa4660401a
line wrap: on
line diff