Merge from origin/emacs-24

[gnu-emacs] / lisp / calendar / diary-lib.el

diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 43f2ea489325582a011711ff46e41c61a2578ffe..29364b55b6c8235358137438cc57a38947fab381 100644 (file)
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1,6 +1,7 @@
 ;;; diary-lib.el --- diary functions
 
-;; Copyright (C) 1989-1990, 1992-1995, 2001-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1989-1990, 1992-1995, 2001-2015 Free Software
+;; Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>