; Merge from origin/emacs-25

[gnu-emacs] / lisp / erc / erc-xdcc.el

diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 85356b39033d052926bb5ebdba8cffdf3ef47eef..0e2a5d12beb8fd5b06dc59ff9d383720f8e0fe5a 100644 (file)
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -1,9 +1,9 @@
 ;;; erc-xdcc.el --- XDCC file-server support for ERC
 
-;; Copyright (C) 2003-2004, 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2004, 2006-2016 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes
 
 ;; This file is part of GNU Emacs.