commit: merge branches...

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-mercurial-utils/rev/0a009084fd50f9a683887fd0dad283b6d6760576


changeset:   32:0a009084fd50f9a683887fd0dad283b6d6760576
tag:         tip
parent:      31:f0fcffd46f3150f036a0fb917d56bf6838f3e8de
parent:      26:1b36c7876448a1366bbcc6f1e2dcf407310bebfe
user:        Michael Prokop <mika at grml.org>
date:        Thu Nov 30 20:26:26 2006 +0100
files:       
description:
merge branches...