Merge branch 'debian'

Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index d6361e0,8f132af..2a06227
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,28 +1,45 @@@
+ live-boot (3.0~b10-1) unstable; urgency=low
+ 
+   [ Daniel Baumann ]
+   * Adding live-tools to recommends.
+ 
+   [ Michal Suchanek ]
+   * Including util-linux mount in initramfs.
+ 
+   [ Daniel Baumann ]
+   * Making overwriting of /bin/mount within initramfs with mount.util-
+     linux dependent on fuse usage, not on some additional boot parameter.
+   * Correcting spelling typo in bug script.
+ 
+   [ Richard Nelson ]
+   * Update manpage information of ip= param to correctly reflect what
+     9990-netbase.sh expects.
+ 
+   [ Daniel Baumann ]
+   * Cleaning up manpage po files.
+ 
+   [ Evgeni Golov ]
+   * Do not fix mountpoints with live-persistence.conf as home-rw/live-rw.
+ 
+  -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:22:50 +0100
+ 
 +live-boot (3.0~b9-1+grml.1) unstable; urgency=low
 +
 +  [ Evgeni Golov ]
 +  * [bdc44cd] drop 37_fix_legacy_persistence_handling.patch, applied
 +    upstream
 +
 +  [ Michael Prokop ]
 +  * [1aa780a] Refresh patches against current master
 +  * [a133107] Add patch to drop nameserver handling from ip= boot
 +    parameter
 +  * [7782d4f] Add patch to restore support for persistence media with
 +    LABEL=custom-ov (credits to Evgeni)
 +  * [b7de9b2] Do not fix mountpoints with live-persistence.conf as
 +    home-rw/live-rw (credits to Evgeni)
 +
 + -- Michael Prokop <mika@grml.org>  Mon, 17 Dec 2012 18:22:27 +0100
 +
  live-boot (3.0~b9-1) unstable; urgency=low
  
    [ Tails developers ]

diff --cc debian/control
index 9b10877,ae41843..28cc4d5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,22 -1,18 +1,22 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Debian Live Project <debian-live@lists.debian.org>
 -Uploaders: Daniel Baumann <daniel@debian.org>
 -Build-Depends: debhelper (>= 9)
 +Maintainer: Grml Team <team@grml.org>
 +Build-Depends: debhelper (>= 9), quilt (>= 0.46-7~)
  Standards-Version: 3.9.4
  Homepage: http://live.debian.net/devel/live-boot/
 -Vcs-Browser: http://live.debian.net/gitweb/?p=live-boot.git
 -Vcs-Git: git://live.debian.net/git/live-boot.git
 +Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
 +Vcs-Git: git://git.grml.org/live-boot-grml.git
 +Origin: Grml
 +Bugs: mailto:bugs@grml.org
  
 -Package: live-boot
 +Package: live-boot-grml
  Architecture: all
 -Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend
 -Recommends: live-boot-doc, live-tools, rsync, uuid-runtime
 +Depends: ${misc:Depends}, genext2fs, live-boot-grml-initramfs-tools | live-boot-backend
- Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime
++Recommends: live-boot-grml-doc, live-tools, eject, file, rsync, uuid-runtime
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
  Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
  Description: Live System Boot Scripts
   live-boot contains the scripts that configure a live system during the boot

diff --cc debian/live-boot-grml.bug-presubj
Simple merge