commit: merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml/rev/5373ddb7ed9cb60d91a20ad1a849d64a33a2d93f


changeset:   11:5373ddb7ed9cb60d91a20ad1a849d64a33a2d93f
tag:         tip
parent:      10:42ddb901442154e7216f3b8e43c8822a5f7c1b79
parent:      9:5eb716120d821d1517069eb67e525caeae6bb320
user:        Michael Prokop <mika at grml.org>
date:        Sat Apr 14 14:06:12 2007 +0200
files:       debian/changelog debian/control
description:
merge branches