Merge branch 'debian'

Conflicts:
	debian/changelog

diff --cc debian/changelog
index ff0bafb,cd5d7b4..4993173
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,27 @@@
+ live-boot (4.0.2-1) unstable; urgency=low
+ 
+   [ Daniel Baumann ]
+   * Dropping usage of /etc/fstab.d since util-linux removed it, thanks to
+     Evgeni Golov <evgeni+git@golov.de> for reporting it.
+ 
+   [ Jan Blunck ]
+   * Fix spelling of unknown
+   * Suppress annoying but harmless warning about unknown module
+ 
+  -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 10 Dec 2014 10:36:04 +0100
+ 
 +live-boot (4.0.1-1+grml.2) unstable; urgency=medium
 +
 +  * stop using /etc/fstab.d
 +
 + -- Evgeni Golov <evgeni@debian.org>  Thu, 30 Oct 2014 07:31:08 +0100
 +
 +live-boot (4.0.1-1+grml.1) unstable; urgency=medium
 +
 +  * Import 4.0.1-1 from Debian.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Sun, 26 Oct 2014 11:31:59 +0100
 +
  live-boot (4.0.1-1) unstable; urgency=low
  
    [ victory ]