X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=docs%2FChangeLog;h=6d28a06321ac6aa7fb237319b9eb5f127c22cec3;hb=refs%2Ftags%2Fupstream%2F1.96.1;hp=32fa652b38f4f9ac9c74b3a925d26df78118484c;hpb=496e07acecac83f5f19fa68a3017987b7b311396;p=live-boot-grml.git

diff --git a/docs/ChangeLog b/docs/ChangeLog
index 32fa652..6d28a06 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,20 @@
+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: