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)
git://anonscm.debian.org/debian-live/live-boot.git

 Conflicts:
backend/initramfs-tools/live.hook
components/9990-cmdline-old
debian/changelog
debian/control


No differences found