commit: Merge branches

[Michael Prokop]

Changeset available online at:

http://hg.grml.org/grml-live/rev/6cdf496ec51f40d192ad081d1642376ef9d6da9a


changeset:   312:6cdf496ec51f40d192ad081d1642376ef9d6da9a
tag:         tip
parent:      311:bbf7a227376b5cea6d5df0fabebfedb7a71aff72
parent:      310:5fbac9527d7016131800a942a1bd2b4a147654e9
user:        Michael Prokop <mika at grml.org>
date:        Mon Nov 19 12:50:18 2007 +0100
files:       debian/changelog
description:
Merge branches