Merge remote-tracking branch 'upstream/master'
authorMichael Büchler <mbuechler.3@gmail.com>
Mon, 20 Mar 2017 19:51:45 +0000 (20:51 +0100)
committerMichael Büchler <mbuechler.3@gmail.com>
Mon, 20 Mar 2017 19:51:45 +0000 (20:51 +0100)
commite6f399c69f13300dd83949266d4ab6161768faa5
tree902838b480cd62e888d0763f285a8deb9d14e4cc
parentfba9b94a92296f4a19368ee98a112fd95f1b81c0
parentaac901419ae2e09a167135cd80bc58fdb66cc2c1
Merge remote-tracking branch 'upstream/master'

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

 Conflicts:
backend/initramfs-tools/live.hook
components/9990-cmdline-old
debian/changelog
debian/control
backend/initramfs-tools/live.hook
components/9990-misc-helpers.sh
components/9990-netbase.sh
debian/changelog
debian/live-boot-grml-initramfs-tools.postinst