X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=docs%2FChangeLog;h=6d28a06321ac6aa7fb237319b9eb5f127c22cec3;hb=7f7d5b8704823aa1bbbfec8390ee7fca5bc8afb5;hp=d30ef8bc7fcacbb793c61b166076e85b48020981;hpb=86cb1930ec63c3554154d4f9eec36ad3d508ec7c;p=live-boot-grml.git

diff --git a/docs/ChangeLog b/docs/ChangeLog
index d30ef8b..6d28a06 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,27 @@
+2007-08-21  Daniel Baumann  <daniel@debian.org>
+
+	* Merging changes from casper 1.96.
+	* Uploaded 1.96.1-1.
+
+2007-08-21  Daniel Baumann  <daniel@debian.org>
+
+	* scripts/live:
+	  - Applied patch from Jesse W. Hathaway <jesse@mbuki-mvuki.org> to
+	    not use nfsro with kernels larger than 2.6.22 (where unionfs 2.x
+	    is supposed to be available soon).
+	* Uploaded 1.95.3-1.
+
+2007-08-11  Daniel Baumann  <daniel@debian.org>
+
+	* Uploaded 1.95.2-1.
+
+2007-08-01  Daniel Baumann  <daniel@debian.org>
+
+	* scripts/live-bottom/10adduser:
+	  - Setting debconf preseeding for passwd/make-user manually to true,
+	    overriding any users preseeding on that, so that the user account
+	    gets created for sure.
+
 2007-07-29  Daniel Baumann  <daniel@debian.org>
 
 	* Merging changes from casper 1.95.