From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 11:56:38 +0000 (+0200)
Subject: Merging casper 1.226.
X-Git-Tag: debian/1.236.1-1~11
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=bbfefd597f2a4ff19a16a27810ef032d9bd0dee7;p=live-boot-grml.git

Merging casper 1.226.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index 2aa7d23..7a5ba08 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,16 @@
+casper (1.226) lucid; urgency=low
+
+  [ Colin Watson ]
+  * Stop using removed nfsro option for NFS/unionfs (thanks, Bernhard
+    Seibold; LP: #460781).
+
+  [ Jonathan Riddell ]
+  * Remove scripts/casper-bottom/48enable_kubuntu_netbook and ubiquity-
+    hooks/48enable_kubuntu_netbook now enabled in kubuntu-netbook-
+    default-settings
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 10 Mar 2010 22:23:04 +0000
+
 casper (1.225) lucid; urgency=low
 
   * Add ubiquity-hooks/49kubuntu_gnome_icon_cache to recreate the Gnome