Merge branches

[grml-live.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index aa5d50e..04f235f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ grml-live (0.2) unstable; urgency=low
     for providing default /etc/default/loadcpufreq configuration.
   * Move sourcing /etc/grml/grml-live.local *before* the cmdline
     option parsing so we can override already set defaults interative.
+  * Grep using the quiet option for squashfs features.
 
  -- Michael Prokop <mika@grml.org>  Mon, 14 Jan 2008 22:54:10 +0100
 
@@ -14,6 +15,8 @@ grml-live (0.1) unstable; urgency=low
 
   * Bump version number to 0.1 as we ship grml-live with the
     upcoming stable versions.
+  * Source /etc/grml/grml-live.local before parsing command line
+    options to be able to override configuration on the commandline.
   * Use /usr/bin/vim.tiny as alternativ for vi.
   * Add new packages to GRML_FULL:
     - at76-usb-modules-2.6.23-grml64