Merge branch 'debian': Imported 3.0~b8-1 from Debian Live
authorEvgeni Golov <evgeni@debian.org>
Tue, 4 Dec 2012 14:15:58 +0000 (15:15 +0100)
committerEvgeni Golov <evgeni@debian.org>
Tue, 4 Dec 2012 14:15:58 +0000 (15:15 +0100)
commitb5809b75c8aabfef185edb36f141019e69f8b3de
tree8cb910e6d7e45db87728a05c18da7b923f318db9
parentc397f1f282c667b8fd6dba8827d6ae383f4f4730
parentcd438f06901d6dbc2ca5c2be7dd3d5b03f4b7719
Merge branch 'debian': Imported 3.0~b8-1 from Debian Live

Conflicts:
debian/control
debian/changelog
debian/control
debian/live-boot-grml.bug-script