Merge from emacs-23

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

diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 0fc63e7eaaccaa6ab90b17df707c8ab22a20e4b9..3c3148aca3739b50f718468b739a386fc3556b89 100644 (file)
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -1,7 +1,7 @@
 ;;; cal-china.el --- calendar functions for the Chinese calendar
 
 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>