Merge remote-tracking branch 'upstream/master' mika/debian
authorMichael Prokop <mika@grml.org>
Tue, 28 Jun 2016 08:42:17 +0000 (10:42 +0200)
committerMichael Prokop <mika@grml.org>
Tue, 28 Jun 2016 08:42:17 +0000 (10:42 +0200)
git://anonscm.debian.org/debian-live/live-boot.git

Conflicts:
backend/initramfs-tools/live.hook
components/0020-read-only
components/9990-aaa-fixme.sh
components/9990-cmdline-old
debian/changelog


No differences found