Merge remote branch 'origin/master'

[grml2usb.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 99ebb81..edc8bd5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-grml2usb (0.9.17) UNRELEASED; urgency=low
+grml2usb (0.9.17) unstable; urgency=low
 
+  [ Michael Prokop ]
   * Depend on rsync (thanks for the bugreport, Andras Korn).
 
- -- Michael Prokop <mika@grml.org>  Tue, 27 Oct 2009 23:49:37 +0100
+  [ Ulrich Dangel ]
+  * Adjust labels in {grml,default}.cfg if necessary.
+  * Always copy grub files.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 29 Oct 2009 01:06:12 +0100
 
 grml2usb (0.9.16) unstable; urgency=low