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)
commit202dc5012543bcfcc6b535b90ca1c652241f7eb2
treecbbafd95f090a19a469412bebdc124819be6058f
parentc910bebbe6a74f13e046e6607d69f6f418ae2f9c
parentb98d289f42df126760c84957f69e5fdc7807d159
Merge remote-tracking branch 'upstream/master'

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
backend/initramfs-tools/live.hook
components/9990-cmdline-old
components/9990-misc-helpers.sh
debian/changelog
debian/rules