Merge from origin/emacs-24

[gnu-emacs] / lisp / net / telnet.el

diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 00a556813c117490814ef49ae7517d1075302038..f844f83d7167f420e430645077dcd161c9fae7bd 100644 (file)
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -1,10 +1,10 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
-;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1988, 1992, 1994, 2001-2015 Free Software
+;; Foundation, Inc.
 
 ;; Author: William F. Schelter
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, comm
 
 ;; This file is part of GNU Emacs.