X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=docs%2FChangeLog;h=6d28a06321ac6aa7fb237319b9eb5f127c22cec3;hb=63b3fae5c7adef1ebb5906d1d4e8e525b32a1c23;hp=ac88a8d5fd15fa942b0f0894b0cac640f475feb2;hpb=344fb6b7c015afe8f3878926d2fccba88c616aac;p=live-boot-grml.git

diff --git a/docs/ChangeLog b/docs/ChangeLog
index ac88a8d..6d28a06 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,5 +1,10 @@
 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