commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/da92bf8caf9353cdc773db35f06995cb71feb549


changeset:   465:da92bf8caf9353cdc773db35f06995cb71feb549
tag:         tip
parent:      464:d026040ece92ba006419c8d0647ea6db11d7ed2e
parent:      463:2a52fa6a65819efb6aa0d4a2a962aaf5c326e249
user:        Michael Prokop <mika at grml.org>
date:        Tue Jan 22 11:58:17 2008 +0100
files:       debian/changelog grml-live
description:
Merge branches