commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/56fcf537770439a667843f3bad0ab1fe15b3c478


changeset:   454:56fcf537770439a667843f3bad0ab1fe15b3c478
tag:         tip
parent:      453:bcd17bdc49a7b895297cfd2cbeb1150f40b3b2e0
parent:      452:b076d50923f70ffd70cd387a60703e0282b4f051
user:        Michael Prokop
date:        Sun Jan 13 14:29:09 2008 +0100
files:       debian/changelog
description:
Merge branches