Merge from origin/emacs-24

[gnu-emacs] / lisp / calendar / time-date.el

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index e7a8cc7eb25f9460c897ded1af77bdfd5d7b5e04..bb7e97ea7f32b7c049c19c9be732a6b5a84e15f8 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu Umeda <umerin@mse.kyutech.ac.jp>