diff COPYRIGHT @ 24211:de3e32bb942a

merge of '014e1f90f8ee8c07fa6d5bef545016ecfafda630' and '7d61237e0ffb6113b3c1286311b584034a870b19'
author Marcus Lundblad <ml@update.uu.se>
date Sun, 19 Oct 2008 21:46:38 +0000
parents 0006181485ea
children 03c73e917b1b
line wrap: on
line diff