X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=ChangeLog;h=5da461b5504ef62edcc676b380ea042a09113437;hp=e92660e53e99d59886b26dadbbfabec6dfda532e;hb=faaa147b353c1fba0ebd9a071962e098f9b51a25;hpb=cff51866dd4b4de7b2f70676fa26b31c31e216d7

diff --git a/ChangeLog b/ChangeLog
index e92660e5..5da461b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+2009-09-04  Micah Cowan  <micah@cowan.name>
+
+	* update-copyright: Imported from gnulib.
+	* gnupload: Imported from gnulib.
+	* lib/Makefile.am, m4/gnulib-cache.m4, m4/gnulib-comp.m4: Adjusted
+	for update-copyright and gnupload.
+	
 2009-09-03  Micah Cowan  <micah@cowan.name>
 
+	* NEWS: Give credit to jff for SSL security fix, call attention to
+	IRI support's dependence on libidn and libiconv, and note that
+	--html-extension is still accepted, though deprecated.
+
 	* lib/*, m4/*: Updated gnulib.
 	* lib/getpagesize.c, lib/memchr.c, lib/memchr.valgrind,
 	lib/stddef.in.h, lib/str-two-way.h, lib/strcasecmp.c,