1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fb0cb9a..379e2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-10  Robert James Kaes  <rjkaes@users.sourceforge.net>
+
+	Merged in changes from 1.6.3.
+	
 2004-01-26  Robert James Kaes  <rjkaes@flarenet.com>
 
 	Released tinyproxy 1.7.0 (2004-01-26)