From: Michael Prokop <devnull@localhost>
Date: Sun, 13 Jan 2008 13:29:09 +0000 (+0100)
Subject: Merge branches
X-Git-Tag: 0.1~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=f44a0326893ad30927009056ce7a706b11460327;hp=0bca675bc0be092e9def716723f342d7ddc9164f;p=grml-live.git

Merge branches
---

diff --git a/debian/changelog b/debian/changelog
index f2eca27..2319eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ grml-live (0.1) unstable; urgency=low
     - truecrypt-2.6.23-grml64
     - unsort
   * Add new packages to GRML_MEDIUM:
+    - ntfs-3g
     - truecrypt-2.6.23-grml64
   * templates/boot/grub/menu.lst, templates/boot/isolinux/*.cfg:
     - drop deprecated entries
diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM
index a95ee5d..f4e4a0e 100644
--- a/etc/grml/fai/config/package_config/GRML_MEDIUM
+++ b/etc/grml/fai/config/package_config/GRML_MEDIUM
@@ -151,6 +151,7 @@ netbase
 netcat
 net-tools
 nfs-common
+ntfs-3g
 ntfsprogs
 ntpdate
 nvi