Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-78

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 514-518)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 104-105)

   - Update from CVS

1 files changed, 5 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index cddc109c39b..07c05935fed 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * MORE.STUFF: Update links and URLs.
+
 2005-08-05  Kenichi Handa  <handa@m17n.org>
 
         * NEWS: Fix the entry describing code-pages.
@@ -2175,7 +2179,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-        Free Software Foundation, Inc.
+        2002, 2003, 2004, 2005 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.