Merge from emacs-24; up to 2012-11-26T19:56:14Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / macros.el

diff --git a/lisp/macros.el b/lisp/macros.el
index 554f89a8a60a6d9467677989c1ee1279c33f88dd..2f48aaa982a09c610b82c7a880d031a3cacf0ba7 100644 (file)
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,6 +1,6 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
-;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2011
+;; Copyright (C) 1985-1987, 1992, 1994-1995, 2001-2012
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF