X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=docs%2FChangeLog;h=ce612a169e9afd2c63135e918183adffd3a763d3;hb=refs%2Ftags%2Fdebian%2F1.99.1-1;hp=5969aeca731df17a98d479bd30eafeab355164cf;hpb=8319c25431ac31bb67621a27dc569abedccf1ab1;p=live-boot-grml.git

diff --git a/docs/ChangeLog b/docs/ChangeLog
index 5969aec..ce612a1 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-01  Daniel Baumann  <daniel@debian.org>
+
+	* Merging changes from casper 1.97, 1.98 and 1.99.
+	* Uploaded 1.99.1-1.
+
 2007-08-29  Daniel Baumann  <daniel@debian.org>
 
 	* scripts/live-bottom/12fstab: