[Git-commits] [grml/live-boot-grml] 41ef44: Merge branch 'debian' into master

[Ulrich Dangel]

  Branch: refs/heads/mru/new_version
  Home:   https://github.com/grml/live-boot-grml

  Commit: 41ef444a3219cd4429487dd80f0ef1b3533d0783
      https://github.com/grml/live-boot-grml/commit/41ef444a3219cd4429487dd80f0ef1b3533d0783
  Author: Ulrich Dangel <mru at grml.org>
  Date:   2011-07-24 (Sun, 24 Jul 2011)

  Changed paths:
    M Makefile
  M VERSION
  M bin/live-snapshot
  M debian/changelog
  M debian/control
  A debian/live-boot-doc.install
  M debian/live-boot-grml.init
  A debian/live-boot.install
  M manpages/Makefile
  M manpages/de/live-boot.de.7
  M manpages/de/live-snapshot.de.1
  M manpages/en/live-boot.7
  M manpages/en/live-snapshot.1
  M manpages/po/de/live-boot.7.po
  M manpages/po/de/live-snapshot.1.po
  M manpages/pot/live-boot.7.pot
  M manpages/pot/live-snapshot.1.pot
  M scripts/live

  Log Message:
  -----------
  Merge branch 'debian' into master

Conflicts:
	Makefile
	debian/changelog
	debian/control
	debian/rules