Merge remote-tracking branch 'upstream/master'
authorMichael Prokop <mika@grml.org>
Tue, 28 Jun 2016 07:21:37 +0000 (09:21 +0200)
committerMichael Prokop <mika@grml.org>
Tue, 28 Jun 2016 07:22:36 +0000 (09:22 +0200)
commit0ae40d84d1979f24c10b0d9bf183470266bc8390
tree59c1bf2cc45cfd48dfd03b00825a3996cced48b7
parent1a226f4c74bf1952ed77394ab9e9805055d0ed35
parentb98d289f42df126760c84957f69e5fdc7807d159
Merge remote-tracking branch 'upstream/master'

git://anonscm.debian.org/debian-live/live-boot.git

Conflicts:
components/9990-aaa-fixme.sh
backend/initramfs-tools/live.hook
components/9990-cmdline-old
components/9990-misc-helpers.sh
debian/changelog
debian/rules