Merge debian/changelog

[grml-scripts-core.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4a50ab1..8caf1f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
 grml-scripts (1.1.18) UNRELEASED; urgency=low
 
   * Add lzop to Depends. [Closes: issue613]
+  * blacklist: use /etc/modprobe.d/grml.conf instead of
+    /etc/modprobe.d/grml. New module-init-tools will
+    use only files using the .conf suffix.
   * Add new script grml-exec-wrapper.
 
- -- Michael Prokop <mika@grml.org>  Thu, 12 Feb 2009 21:04:59 +0100
+ -- Michael Prokop <mika@grml.org>  Tue, 03 Mar 2009 10:35:12 +0100
 
 grml-scripts (1.1.17) unstable; urgency=low