From: Ulrich Dangel <mru@grml.org>
Date: Mon, 18 Apr 2011 20:49:32 +0000 (+0200)
Subject: Merge remote branch 'grml-scripts-split/split/grml-scripts-core'
X-Git-Tag: v1.4.3~8
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=a481de8dab190f141d68e99d22d42ebee44bcddb;hp=a481de8dab190f141d68e99d22d42ebee44bcddb;p=grml-scripts-core.git

Merge remote branch 'grml-scripts-split/split/grml-scripts-core'

Conflicts:
	debian/changelog
	debian/control
	usr_bin/grml-init-screen
---