From: Evgeni Golov <evgeni@grml.org>
Date: Thu, 28 Aug 2014 15:30:11 +0000 (+0200)
Subject: Merge branch 'debian'
X-Git-Tag: v4.0.0-1+grml.1~1
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=1b428f6013d6ef7c8159d803fee1968e1e758e1f

Merge branch 'debian'

Conflicts:
	debian/changelog
---

1b428f6013d6ef7c8159d803fee1968e1e758e1f
diff --cc debian/changelog
index 59df2c0,6aaae88..e9badce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ live-boot (4.0.0-1) unstable; urgency=low
+ 
+   [ Carlos Zuferri ]
+   * Removing obsolete flag '--no-backups' from po4a options.
+   * Adding '--package-version' to po4a options.
+   * Adding .po integrity check target to manpages/Makefile.
+ 
+   [ Daniel Baumann ]
+   * Adding plymouth support for LUKS passwort prompt based on a patch from
+     Gaudenz Steinlin <gaudenz@debian.org> (Closes: #754166).
+ 
+  -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 27 Aug 2014 19:52:09 +0200
+ 
 +live-boot (4.0~alpha21-1+grml.1) UNRELEASED; urgency=medium
 +
 +  * Import 4.0~alpha21 from Debian.
 +
 + -- Evgeni Golov <evgeni@grml.org>  Thu, 10 Apr 2014 08:29:49 +0200
 +
  live-boot (4.0~alpha21-1) unstable; urgency=low
  
    * Building with dh --parallel.