diff COPYRIGHT @ 25884:212fb65cef7f

explicit merge of 'ba66150a2a1efc5a5cee7204adab69208825630e' and 'ac72bbedc88fef81dfdd1e2a4b2587010a030657'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:10:31 +0000
parents 508e57943440
children c9c4b31d98a7
line wrap: on
line diff