Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

[bpt/emacs.git] / src / ChangeLog.1

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index efe7764..0d92676 100644 (file)
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -2237,7 +2237,7 @@
 
        * data.c (Fset):
        If Vautoload_queue non-nil, record function and old definition
-       by consing onto Vautoload_qeueue.
+       by consing onto Vautoload_queue.
 
        * fns.c (Fprovide):
        If Vautoload_queue is non-nil, record old value of Vfeatures.
@@ -3521,7 +3521,7 @@
        * minibuf.c: Don't allow entry to minibuffer
        while minibuffer is selected.
 
-    Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
+    Copyright (C) 1985-1986, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.