Merge from emacs-23

[gnu-emacs] / lisp / macros.el

diff --git a/lisp/macros.el b/lisp/macros.el
index cbceb96fade4d84f18418147dec69fcf0c3d77f8..4ac740d4fc80a186fcef0c5087aa17fb4a1bf63f 100644 (file)
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,7 +1,7 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev