Merge from emacs-24; up to 2012-12-20T16:09:05Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / ChangeLog.10

diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index d94d72d0f3c088c2fc30b207a6a9e40b6f4ca0a8..641ab617043a1b5018f4fe27242b7db6ec9646ec 100644 (file)
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -5492,7 +5492,7 @@
 
 2003-02-14  Dave Love  <fx@gnu.org>
 
-       * international/code-pages.el: Undo `Trailing whitepace deleted.'
+       * international/code-pages.el: Undo `Trailing whitespace deleted.'
        damage.
        (cp1125, mik): Nullify mime-charset.
 
@@ -23534,7 +23534,7 @@ See ChangeLog.9 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 2001-2012  Free Software Foundation, Inc.
+    Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.