diff po/ChangeLog @ 29866:5b1b7c5393f6

merge of 'f14dddd03f189029f2313c234b5e9dc9964b8fa8' and 'f7ee01128f9373b2d98f537af9109a36acc58d1e'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 10 Feb 2010 20:53:32 +0000 (2010-02-10)
parents b62d06a0e8ef
children 3faec90a72e7 8c87d8558fb5
line wrap: on
line diff