commit: Merge branches

[Michael Prokop]

Changeset available online at:

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


changeset:   468:e1f28a1acff9ce08501b43ac5bdad8f32b88a3f9
tag:         tip
parent:      467:b7709b8a9924ef6cbdafa818877905be7302474b
parent:      465:da92bf8caf9353cdc773db35f06995cb71feb549
user:        Michael Prokop
date:        Wed Jan 30 23:38:03 2008 +0100
files:       debian/changelog
description:
Merge branches