Revision: emacs@sv.gnu.org/gnus--devo--0--patch-31

Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 57)

   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 26)

   - Merge from emacs--devo--0

diff --git a/lisp/parse-time.el b/lisp/parse-time.el
index e145d27..693f0fc 100644 (file)
--- a/lisp/parse-time.el
+++ b/lisp/parse-time.el
@@ -1,6 +1,6 @@
 ;;; parse-time.el --- Parsing time strings
 
-;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>

diff --git a/lisp/time-date.el b/lisp/time-date.el
index 0cb53a2..d8e8480 100644 (file)
--- a/lisp/time-date.el
+++ b/lisp/time-date.el
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>