Merge from origin/emacs-24

[gnu-emacs] / lisp / mail / mailheader.el

diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 6adcb25904b7c56bad24d50d2b4fb701086d39ab..7606e266745e031fa6af7d229d096a32e3608836 100644 (file)
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -1,6 +1,6 @@
 ;;; mailheader.el --- mail header parsing, merging, formatting
 
-;; Copyright (C) 1996, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Keywords: tools, mail, news