Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / lisp / ChangeLog.4

diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index c69c5bf..f9407ce 100644 (file)
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -2000,7 +2000,7 @@
 
        * edebug.el: New version from author.
 
-       * cust-print.el Change "internal" to "original" throughout.
+       * cust-print.el: Change "internal" to "original" throughout.
        (add-custom-printer, delete-custom-printer): Replace old
        customizers.
        (with-custom-print): New.
@@ -8936,8 +8936,7 @@ See ChangeLog.3 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008  Free Software Foundation, Inc.
+    Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -8954,4 +8953,3 @@ See ChangeLog.3 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 91035822-35c7-44a9-8417-2454b88c3db2