Merge from emacs-23

[gnu-emacs] / lisp / calendar / cal-mayan.el

diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index d2e4810fa82fb4446a3d149d17f8db756444fa3e..0fd9a628c700d13f41142ce290146ab8eba8250c 100644 (file)
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -1,7 +1,7 @@
 ;;; cal-mayan.el --- calendar functions for the Mayan calendars
 
 ;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;         Edward M. Reingold <reingold@cs.uiuc.edu>