commit: merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml64/rev/12f8668c42a3297a6788fe4b59249ddc5c46f414


changeset:   5:12f8668c42a3297a6788fe4b59249ddc5c46f414
tag:         tip
parent:      4:b037aa1b6bb03305a21c6d93cc1c1529a8fafc77
parent:      3:76ff088e5244666e8602d6db9e4b1b2c53c21106
user:        Michael Prokop <mika at grml.org>
date:        Sun May 06 11:19:16 2007 +0200
files:       debian/changelog
description:
merge branches