From 2d45444aa9fdd1ba3a7566215ce1d29787a839e0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 25 Nov 2008 06:58:28 +0100
Subject: Merging casper 1.154.

---
 docs/ChangeLog.casper | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'docs')

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 97d667c..d366027 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,17 @@
+casper (1.154) jaunty; urgency=low
+
+  [ Evan Dandrea ]
+  * scripts/casper-bottom/02timezone:
+    - Remove as it's no longer needed and resets the timezone when
+      persistence is enabled (LP: #296855).
+
+  [ Colin Watson ]
+  * Preseed console-setup/optionscode and console-setup/codesetcode to the
+    empty string on boot to avoid debris from the live filesystem build
+    process getting in the way of installation (LP: #94177).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 23 Nov 2008 12:44:45 +0000
+
 casper (1.153) jaunty; urgency=low
 
   * scripts/casper-bottom/10adduser:
-- 
cgit v1.2.3