Merge branch 'debian': Imported 3.0~b6-1 from Debian Live
authorEvgeni Golov <evgeni@grml.org>
Mon, 26 Nov 2012 16:20:32 +0000 (17:20 +0100)
committerEvgeni Golov <evgeni@grml.org>
Mon, 26 Nov 2012 16:20:32 +0000 (17:20 +0100)
commit76af4813596007fc5e4db649f9dd9b498058e2e2
treeb99d4fa5bd7206783fa86d7ea0702b24e67dec0d
parenta3252697c2a93c94183fa8c9c29854e30d4096d8
parent96b643e3a4d8ee0dcf0526182190a9d4526c626b
Merge branch 'debian': Imported 3.0~b6-1 from Debian Live

Conflicts:
Makefile
VERSION
backends/initramfs-tools/live.hook
bin/live-snapshot
debian/changelog
debian/control
debian/copyright
debian/live-boot-grml-initramfs-tools.triggers
debian/live-boot-grml.init
debian/rules
manpages/de/live-boot.de.7
manpages/de/live-snapshot.de.1
manpages/en/live-boot.7
manpages/en/live-snapshot.1
manpages/po/de/live-boot.7.po
manpages/po/de/live-snapshot.1.po
manpages/po4a.cfg
manpages/pot/live-boot.7.pot
manpages/pot/live-snapshot.1.pot
scripts/live
scripts/live-bottom/08persistence_excludes
scripts/live-bottom/12fstab
scripts/live-helpers
debian/changelog
debian/control
debian/live-boot-grml-initramfs-tools.postinst
debian/live-boot-grml.install
debian/rules