Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0

1 files changed, 10 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 5411a0cf626..3d64ba12cc3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-05  Jay Belanger  <belanger@truman.edu>
+
+        * calccard.tex: Update copyright year.
+
+2006-02-04  Michael Olson  <mwolson@gnu.org>
+
+        * NEWS: Update for ERC 5.1.1.  Use the same wording for headings
+        that Emacs does in its NEWS file.
+
 2006-02-03  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 7.91.
@@ -2542,7 +2551,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-        2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+        2002, 2003, 2004, 2005, 2006 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.