[Git-commits] [grml/live-boot-grml] 202dc5: Merge remote-tracking branch 'upstream/master'

[Michael Prokop]

  Branch: refs/heads/mika/debian
  Home:   https://github.com/grml/live-boot-grml
  Commit: 202dc5012543bcfcc6b535b90ca1c652241f7eb2
      https://github.com/grml/live-boot-grml/commit/202dc5012543bcfcc6b535b90ca1c652241f7eb2
  Author: Michael Prokop <mika at grml.org>
  Date:   2016-06-28 (Tue, 28 Jun 2016)

  Changed paths:
    R VERSION
    M backend/initramfs-tools/live.hook
    A components/0001-init-vars.sh
    M components/0020-read-only
    R components/9990-aaa-fixme.sh
    M components/9990-cmdline-old
    M components/9990-misc-helpers.sh
    M components/9990-mount-http.sh
    M components/9990-overlay.sh
    M debian/changelog
    M debian/rules
    R debian/source/options
    M frontend/live-boot
    M manpages/Makefile
    M manpages/bin/update-version.sh
    M manpages/en/live-boot.7
    M manpages/es/live-boot.es.7
    M manpages/ja/live-boot.ja.7
    M manpages/po/es/live-boot.7.po
    M manpages/po/ja/live-boot.7.po
    M manpages/pot/live-boot.7.pot

  Log Message:
  -----------
  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