From: Evgeni Golov <evgeni@grml.org>
Date: Wed, 10 Dec 2014 11:39:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'grml/master'
X-Git-Tag: debian/5.0_a4-1+grml.1~30
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=17381f923755faece25b43771545c5fa8cedcefc;p=live-boot-grml.git

Merge remote-tracking branch 'grml/master'

Conflicts:
	debian/changelog
---

17381f923755faece25b43771545c5fa8cedcefc
diff --cc debian/changelog
index 4993173,2c8a68f..4e75b97
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,23 @@@
 +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.3) unstable; urgency=medium
+ 
+   [ Evgeni Golov ]
+   * [ca03a16] update stop-using-etc-fstab.d.patch to latest upstream
+     version
+ 
+  -- Michael Prokop <mika@grml.org>  Thu, 13 Nov 2014 09:56:07 +0100
+ 
  live-boot (4.0.1-1+grml.2) unstable; urgency=medium
  
    * stop using /etc/fstab.d