Merge remote branch 'grml-scripts-split/split/grml-scripts-core'
authorUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:49:32 +0000 (22:49 +0200)
committerUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:49:32 +0000 (22:49 +0200)
commita481de8dab190f141d68e99d22d42ebee44bcddb
tree34639ffad21df9119a407e5c10f8df8af8e5de44
parent1b8dcad8b9da618cb6c0e22a762cafb08e262640
parent20f49940e8fb2bfc790e88f25d1fa728b4067d1d
Merge remote branch 'grml-scripts-split/split/grml-scripts-core'

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