Merge from origin/emacs-25

[gnu-emacs] / lisp / calc / calccomp.el

diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 119f41993c36f6d12c1775840e5b602b106ddcd8..a36e9e17f27bfbe539ab3d8233b34ec960aea5cd 100644 (file)
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1,9 +1,8 @@
 ;;; calccomp.el --- composition functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.